diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-07-29 15:51:57 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-29 23:24:21 +0000 |
| commit | 9a897d55fcf8a58d730ae0878bf415697a15b5e6 (patch) | |
| tree | c16fada7214f27c7a7c792e899f77b67ddffa26e /packaging/nsis/wireshark.nsi | |
| parent | 9d0e4f6fdb2ed940b625a8b32707027e6f021a95 (diff) | |
| download | wireshark-9a897d55fcf8a58d730ae0878bf415697a15b5e6.tar.gz | |
Use windeployqt with NSIS.
If we find windeployqt, use it to create a DLL manifest for NSIS.
Fall back to the previous manual lists if we don't. This assumes that
your copy of windeployqt works.
New bug: The Windows installer is huge when using the official Digia DLLs
(around 43 MB for the win 64 package).
Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60
Reviewed-on: https://code.wireshark.org/review/3253
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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! ; ============================================================================ |