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

CMake: Make sure we deploy Qt PDBs on Windows. 

Pass "--pdb" to windeployqt 5.6 and later.

Add a note about installing the "Qt Debug Information Files" component
to the Developer's Guide.

Change-Id: I81329bc9f9131050b1076fe275445b6325c24794
Reviewed-on: https://code.wireshark.org/review/31921
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2019-02-06 14:11:07 -08:00 committed by Anders Broman
parent ea75ba8146
commit 0173337c91
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1174,6 +1174,10 @@ if (QT_FOUND)
HINTS "${QT_BIN_PATH}"
DOC "Path to the windeployqt utility."
)
if(Qt5Widgets_VERSION VERSION_GREATER "5.5.999")
set(QT_WINDEPLOYQT_EXTRA_OPTS --pdb)
endif()
elseif(APPLE)
find_program(QT_MACDEPLOYQT_EXECUTABLE macdeployqt
HINTS "${QT_BIN_PATH}"
@ -2204,6 +2208,7 @@ if(BUILD_wireshark AND QT_FOUND)
$<$<NOT:$<CONFIG:Debug>>:--release>
--no-compiler-runtime
--verbose 10
${QT_WINDEPLOYQT_EXTRA_OPTS}
"$<TARGET_FILE:wireshark>"
)
add_dependencies(copy_qt_dlls wireshark)

18
docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
View File

@ -92,14 +92,16 @@ problems.
==== Install Qt
The main Wireshark application uses the Qt windowing toolkit. To
install Qt, go to the https://www.qt.io/download[“Download Qt” page],
select “Go open source”, download the *Qt Online Installer for Windows*
from the Qt Project and select, for the desired Qt version, a component
that matches your target system and compiler. For example, the Qt {qt-lts-version}.5
“msvc2017 64-bit” component is used to build the official 64-bit
packages. You can deselect all the Qt xxxx (e.g. Qt Charts) components
as they aren’t required.
The main Wireshark application uses the Qt windowing toolkit. To install
Qt, go to the https://www.qt.io/download[“Download Qt” page], select “Go
open source”, download the *Qt Online Installer for Windows* from the Qt
Project and select, for the desired Qt version, a component that matches
your target system and compiler. For example, at the time of this
writing the Qt {qt-lts-version}.1 “msvc2017 64-bit” component is used to
build the official 64-bit packages. The “Qt Debug Information Files”
component contains PDB files which can be used for debugging. You can
deselect all of the other the components such as “Qt Charts” or “Android
xxxx” as they aren’t required.
Note that installation of separate Qt components are required for 32 bit
and 64 bit builds, e.g. “msvc2017 32-bit” and “msvc2017 64-bit”. The