diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
| commit | 36ff508507eb52ae37e5015f52701bb1d26cafcf (patch) | |
| tree | c95f62cab84c5234e7a26faddb6deb193319f202 /packaging/nsis/wireshark.nsi | |
| parent | 84bf0acc0035cb284e8afcfb51ac7171eafc25ef (diff) | |
Try to fix PortableApps packaging. Note that the Qt definitions should
be in config.nmake along with everything else.
svn path=/trunk/; revision=51598
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ef753687fa..e9d8231958 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -840,15 +840,16 @@ 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 +!ifdef NEED_QT5_DLL File "${QT_DIR}\Qt5Core.dll" File "${QT_DIR}\Qt5Gui.dll" File "${QT_DIR}\Qt5Widgets.dll" File "${QT_DIR}\Qt5PrintSupport.dll" !endif +!ifdef NEED_QT4_DLL +File "${QT_DIR}\QtCore4.dll" +File "${QT_DIR}\QtGui4.dll" +!endif ; Disable Qtshark shortcut if Qtshark isn't selected Push $0 SectionGetFlags ${SecQtshark} $0 |