aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-03-25 21:27:49 +0000
committerGerald Combs <gerald@wireshark.org>2012-03-25 21:27:49 +0000
commite19fa8063e170666c3d8a291d23d7e2d46428b42 (patch)
treea4e9479158b5901bea8f4b579b2caca94973099d /ui/qt
parent6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4 (diff)
Give qmake a VERSION it will accept.
svn path=/trunk/; revision=41762
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/QtShark.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index c127b9876a..40bc3dbb77 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -277,9 +277,9 @@ win32 {
for(FILE,EXTRA_BINFILES){
QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)$$escape_expand(\\n\\t))
}
- PLUGINS_DIR = $(DESTDIR)\\plugins\\$${VERSION}
+ PLUGINS_DIR = $(DESTDIR)\\plugins\\$${VERSION_FULL}
QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\\n\\t))
- QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\wireshark-gtk2\\plugins\\$${VERSION}\\*.dll $(DESTDIR)\\plugins\\$${VERSION}$$escape_expand(\\n\\t))
+ QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\wireshark-gtk2\\plugins\\$${VERSION_FULL}\\*.dll $(DESTDIR)\\plugins\\$${VERSION_FULL}$$escape_expand(\\n\\t))
# This doesn't depend on wireshark-gtk2. It also doesn't work.
#PLUGINS_IN_PWD=$${IN_PWD}