osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

svn path=/trunk/; revision=51609
This commit is contained in:
Gerald Combs 2013-08-31 04:18:42 +00:00
parent a8f4327da7
commit 789a4060da
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/nsis/wireshark.nsi
View File

@ -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

1
packaging/ws-manifest.pl
View File

@ -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

11
ui/qt/QtShark.pro
View File

@ -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 \