Qt5 on Windows needs platforms/qwindows.dll as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@51609 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index e9d82319586c86b59e0b898a7e552b3a33bfbe3f..2b431368d1cd3d54f307d5558a12970b7d2801ee 100644 (file)
--- 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

diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl
index 11386e84f6f74c9550ea770d568c597ddfb8562b..632f2e73048515abf03e9d99792bf4be31e740ad 100755 (executable)
--- a/packaging/ws-manifest.pl
+++ b/packaging/ws-manifest.pl
@@ -15,6 +15,7 @@ my %u3locs = qw(
        $INSTDIR\${GTK_MODULES_DIR} host
        $INSTDIR\etc\pango host
        $INSTDIR\help device
+       $INSTDIR\platforms host
        $INSTDIR\plugins\${VERSION} device
        $INSTDIR\profiles\Bluetooth device
        $INSTDIR\profiles\Classic device

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index a09351fa99bf0878e5c7ee06eeb5aa3b4f5be2aa..237f4c28910ed0fd393a25896e1f88df1d010d23 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -386,11 +386,14 @@ win32 {
         EXTRA_BINFILES += \"$${MSVCR_DLL}\"
     }
 
+    PLATFORM_DLL_DIR = $(DESTDIR)\\platforms
     CONFIG(debug, debug|release) {
         isEqual(QT_MAJOR_VERSION, 4) {
             EXTRA_DLLS = QtCored4 QtGuid4
         } else {
             EXTRA_DLLS = Qt5Cored Qt5Guid Qt5Widgetsd Qt5PrintSupportd
+            EXTRA_PLATFORM_DLLS = qwindowsd
+            QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
         }
     }
     CONFIG(release, debug|release) {
@@ -398,11 +401,19 @@ win32 {
             EXTRA_DLLS = QtCore4 QtGui4
         } else {
             EXTRA_DLLS = Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport
+            EXTRA_PLATFORM_DLLS = qwindows
+            QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
         }
     }
     for(DLL,EXTRA_DLLS){
         EXTRA_BINFILES += $$[QT_INSTALL_BINS]/$${DLL}.dll
     }
+    INSTALL_PLATFORM_DIR = $$[QT_INSTALL_PLUGINS]/platforms
+    INSTALL_PLATFORM_DIR ~= s,/,\\,g
+    for(DLL,EXTRA_PLATFORM_DLLS){
+        QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${INSTALL_PLATFORM_DIR}\\$${DLL}.dll $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
+        EXTRA_BINFILES +=
+    }
 
     EXTRA_BINFILES += \
         ../../dumpcap.exe \