diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-31 04:18:42 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-31 04:18:42 +0000 |
| commit | 789a4060daf04d6a6b4e3d70e8340f2edbb297f3 (patch) | |
| tree | f4b45ca8012a28d5fad929a9991d908af69ac4b7 /packaging/nsis/wireshark.nsi | |
| parent | a8f4327da7f8439787bf5005711715fecceed1b8 (diff) | |
Qt5 on Windows needs platforms/qwindows.dll as well.
svn path=/trunk/; revision=51609
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index e9d8231958..2b431368d1 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -840,15 +840,17 @@ Section "QtShark (Experimental)" SecQtshark ; by default, QtShark is not installed SetOutPath $INSTDIR File "${QT_DIR}\qtshark.exe" +!ifdef NEED_QT4_DLL +File "${QT_DIR}\QtCore4.dll" +File "${QT_DIR}\QtGui4.dll" +!endif !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" +SetOutPath $INSTDIR\platforms +File "${QT_DIR}\platforms\qwindows.dll" !endif ; Disable Qtshark shortcut if Qtshark isn't selected Push $0 |