summaryrefslogtreecommitdiff
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-10-03 08:53:16 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-03 15:54:05 +0000
commit8b7d27c8be1418642fbf089dfdb295a2fc5e5211 (patch)
tree18bfbfff686fb0dc307751b80e10048672b5a8cb /docbook
parentbb5daa6ae9070a1093b5fbc8f078d9eaf101d769 (diff)
downloadwireshark-8b7d27c8be1418642fbf089dfdb295a2fc5e5211.tar.gz
WSDG: Update the Windows Qt download text.
Change-Id: I6fd027ff76b5b463f33992898965a3e037778071 Reviewed-on: https://code.wireshark.org/review/4443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc21
1 files changed, 6 insertions, 15 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index c83142e8fe..573d7c805e 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -114,26 +114,17 @@ problems.
==== Install Qt
-The main Wireshark application uses the Qt windowing toolkit. The installation
-package is quite large and you must currently
-http://qt-project.org/downloads[download] and install it separately.
+The main Wireshark application uses the Qt windowing toolkit. To install Qt
+download the *Online Installer* from the Qt Project
+http://qt-project.org/downloads[download page] and select a component that
+matches your target system and compiler. For example, the ``msvc2013 64-bit
+OpenGL'' component is used to build the official 64-bit packages.
-Note that the Qt package also includes the Qt Creator IDE, which may be useful
+Note that the Qt package also includes the Qt Creator IDE, which is useful
for designing graphical components and includes an interactive debugger.
You'll need to build wireshark using nmake before you'll be able to build the
Wireshark project (ui/qt/Wireshark.pro), however.
-[WARNING]
-.Don't use the default full-package Qt installer
-====
-The default (suggested) full-package Qt installer is built with the MinGW
-toolchain, which is not currently supported by Wireshark's build process on
-Windows and so will not work. Instead, you will want to use the installer for
-the toolchain you are using (e.g. Qt <version> for Windows 32-bit (VS 2013,
-OpenGL) if you are using the toolchain set up by these quick-start
-instructions).
-====
-
[[ChSetupCygwin]]