diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-30 00:43:51 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-30 00:43:51 +0000 |
| commit | 2e857954a317030cf37596b8c11056e07a8f0439 (patch) | |
| tree | 22fff75d4b302ca3481b55add87204662b9de041 /packaging/nsis | |
| parent | 0764fcab89717c7f2f2c63344c3e6c3d0f41df9d (diff) | |
Fix NSIS packaging.
svn path=/trunk/; revision=51583
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index ebfd17ab77..dc1c9cc339 100644 --- 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 69fdec9219..ef753687fa 100644 --- 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 |