From 789a4060daf04d6a6b4e3d70e8340f2edbb297f3 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sat, 31 Aug 2013 04:18:42 +0000
Subject: Qt5 on Windows needs platforms/qwindows.dll as well.

svn path=/trunk/; revision=51609
---
 packaging/nsis/wireshark.nsi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'packaging/nsis/wireshark.nsi')

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
-- 
cgit v1.2.3