diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-07-30 09:33:43 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-30 18:07:29 +0000 |
| commit | 304388a44f6fcb468f98f2c7179bb39cb4ecd294 (patch) | |
| tree | 90c1ceed286a6fe6352a3b9f0bdf9cb06ef26518 /.gitignore | |
| parent | 8d05e85c17353a548327b8dda682e8dbf5518850 (diff) | |
| download | wireshark-304388a44f6fcb468f98f2c7179bb39cb4ecd294.tar.gz | |
Install our Qt DLL directories recursively.
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.
Install and uninstall our .qm files while we're here.
Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5259f23bd8..4e76fd501a 100644 --- a/.gitignore +++ b/.gitignore @@ -207,6 +207,7 @@ packaging/macosx/COPYING.txt packaging/macosx/Info.plist packaging/macosx/osx-dmg.sh packaging/macosx/Wireshark_package.pmdoc/index.xml +packaging/nsis/qt-dll-manifest.nsh packaging/portableapps/win32/Files/ packaging/portableapps/win32/WiresharkPortable.ini packaging/portableapps/win32/appinfo.ini |