diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-03-25 21:27:49 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-03-25 21:27:49 +0000 |
| commit | e19fa8063e170666c3d8a291d23d7e2d46428b42 (patch) | |
| tree | a4e9479158b5901bea8f4b579b2caca94973099d | |
| parent | 6f5273e81e5f5ba0c1e0dc3b52bfd3cecfaaf6c4 (diff) | |
| download | wireshark-e19fa8063e170666c3d8a291d23d7e2d46428b42.tar.gz wireshark-e19fa8063e170666c3d8a291d23d7e2d46428b42.tar.bz2 wireshark-e19fa8063e170666c3d8a291d23d7e2d46428b42.zip | |
Give qmake a VERSION it will accept.
svn path=/trunk/; revision=41762
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 47cac08815..371092770e 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -423,7 +423,9 @@ config.h : config.h.win32 config.nmake ui\qt\config.pri: config.nmake Makefile.nmake @echo Creating <<ui\qt\config.pri # Automatically generated from Makefile.nmake. Edit there, not here. -VERSION = $(VERSION) +# qmake apparently requires a three-part numeric VERSION. +VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) +VERSION_FULL = $(VERSION) !IFDEF MANIFEST_INFO_REQUIRED CONFIG += wireshark_manifest_info_required !ENDIF 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} |