Fix NSIS packaging.

svn path=/trunk/; revision=51583

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index ebfd17ab775c9e77969a4741283e75d21cb7e685..dc1c9cc3392574daa2017f503ff070870e53d915 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -218,6 +218,11 @@ NSIS_FLAGS=\
 !IF EXIST("..\..\wireshark-qt-release\qtshark.exe")
        /DQT_DIR="..\..\wireshark-qt-release" \
 !ENDIF
+!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll")
+       /DQT_VER=5 \
+!ELSE
+       /DQT_VER=4 \
+!ENDIF
 
 $(STAGING_DIR)\uninstall.exe : $(NSI)
        rm -f $(UNINSTALL_INSTALLER)

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 69fdec9219aeb43fd6b3f00c1830717b6742c5e9..ef753687fa64b04ecc0cb0ec130b240c2d337a35 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -840,8 +840,15 @@ Section "QtShark (Experimental)" SecQtshark
 ; by default, QtShark is not installed
 SetOutPath $INSTDIR
 File "${QT_DIR}\qtshark.exe"
+!if ${QT_VER} == "4"
 File "${QT_DIR}\QtCore4.dll"
 File "${QT_DIR}\QtGui4.dll"
+!else
+File "${QT_DIR}\Qt5Core.dll"
+File "${QT_DIR}\Qt5Gui.dll"
+File "${QT_DIR}\Qt5Widgets.dll"
+File "${QT_DIR}\Qt5PrintSupport.dll"
+!endif
 ; Disable Qtshark shortcut if Qtshark isn't selected
 Push $0
 SectionGetFlags ${SecQtshark} $0

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index ccb1d85b13575d8e4b35526b1ab45c532cd1d16c..a09351fa99bf0878e5c7ee06eeb5aa3b4f5be2aa 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -386,18 +386,18 @@ win32 {
         EXTRA_BINFILES += \"$${MSVCR_DLL}\"
     }
 
-    EXTRA_DLLS =
     CONFIG(debug, debug|release) {
         isEqual(QT_MAJOR_VERSION, 4) {
-            EXTRA_DLLS += QtCored4 QtGuid4
+            EXTRA_DLLS = QtCored4 QtGuid4
         } else {
-            EXTRA_DLLS += Qt5Cored Qt5Guid Qt5PrintSupportd
+            EXTRA_DLLS = Qt5Cored Qt5Guid Qt5Widgetsd Qt5PrintSupportd
         }
-    } else:CONFIG(release, debug|release) {
+    }
+    CONFIG(release, debug|release) {
         isEqual(QT_MAJOR_VERSION, 4) {
-            EXTRA_DLLS += QtCore4 QtGui4
+            EXTRA_DLLS = QtCore4 QtGui4
         } else {
-            EXTRA_DLLS += Qt5Cored Qt5Guid Qt5PrintSupportd
+            EXTRA_DLLS = Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport
         }
     }
     for(DLL,EXTRA_DLLS){