diff options
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index a301c6b258..b816e3721b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -875,18 +875,7 @@ Section "${PROGRAM_NAME} 2 Preview" SecWiresharkQt ; by default, QtShark is installed but file is always associate with Wireshark GTK+ SetOutPath $INSTDIR File "${QT_DIR}\${PROGRAM_NAME_PATH_QT}" -!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" -SetOutPath $INSTDIR\platforms -File "${QT_DIR}\platforms\qwindows.dll" -!endif +!include qt-dll-manifest.txt Push $0 ;SectionGetFlags ${SecWiresharkQt} $0 @@ -1051,7 +1040,6 @@ WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "EstimatedSize" "$0" SectionEnd - ; ============================================================================ ; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD! ; ============================================================================ |