Rework Windows Wireshark Qt build configuration a bit:

1. Compile and link with (almost exactly) the same options as used
   when building Windows Wireshark Gtk.
   The options used allow debugging of the exe using Visual Studio exactly
   as is done for Wireshark Gtk.
   Essentially: configure the "release" version to compile and link with
   symbols.  (See ui\qt\QtShark for the details).

2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
   which is linked against the "release" Qt libraries.
   (IOW: don't create a "debug" Makefile).

3. Remove unused variable assignments from config.pri.
   (They can be added back if needed in the future).


svn path=/trunk/; revision=40768

1 files changed, 43 insertions, 9 deletions

diff --git a/doc/README.qt b/doc/README.qt
index d308c07a1b..86aa6661e2 100644
--- a/doc/README.qt
+++ b/doc/README.qt
@@ -46,19 +46,20 @@ ui/qt/config.pri. This file should be created automatically when you
 compile Wireshark in the top-level source directory. You can create it
 by hand by running "nmake -f Makefile.nmake ui\qt\config.pri".
 
+Qt Creator can be used to compile and run Wireshark.
+Alternatively qmake and nmake at the cmd line can be used.
+
+The Windows Qt version of Wireshark will be compiled and linked with essentially
+the same options as that used when building the Gtk version of Wireshark.
+
+1.1.2.1 Qt Creator
+
 Before compiling in Qt Creator select "Projects" in the left toolbar,
 select "Build Settings" and do the following:
 
 - In "Edit build configuration" make sure the "Release" build is selected.
-  ("Debug" currently crashes.)
-  XXX: I was able to build and use a Debug configuration by first building
-       Wireshark with /MDd (instead of the normal /MD).
-       (/MDd is what QtCreator uses for the debug configuration).
-       [Is there a way to config QtCreator to use /MD to build a
-       debug Qt Wireshark ? As a complete Qt newbie I have as yet no idea].
-
-       Note: I did the debugging using the VC2010 debugger rather than
-       invoking the debugger (CDB ?) from QtCreator.
+  (The "Debug" build won't work unless Wireshark is recompiled to link with a "debug"
+   the "debug" C runtime library (using /MDd). See ui\qt\QtShark.pro for details).
 
 - Make sure "Qt version" matches your version of Visual Studio.
 - Make sure "Tool chain" matches your Visual C++ version.
@@ -66,6 +67,39 @@ select "Build Settings" and do the following:
 If you require plugin support select "Run Settings" and add
 "WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1" to the Run Environment.
 
+XXX: (WMeier): I've not had too much satisfaction using the "native Windows debugger" (CDB ?)
+     accessed via Qt Creator. (In fact, a web search turns up some fairly negative comments
+     about the debugger. I've successfully (and pretty easily) been able to use the
+     Visual Studio debugger; See below under "Command Line".
+     ToDo: Investigate "Qt Visual Studio AddIn":
+           http://developer.qt.nokia.com/wiki/QtVSAddin#6112edd2e39a1695c242723d5c764aae
+
+1.1.2.2 Command Line
+
+- Setup environment:
+    c:\qt\4.8.0\bin\qtvars.bat [vsvars]     ;;; optional 'vsvars' to also setup VC env vars
+
+- [Create and] Switch to a working dir to be used for .obj files, etc for Wireshark-qt compilation
+
+- Use qmake to create Windows Makefile (based upon info in ui\qt\QtShark.pro and config.pri)
+    qmake -o Makefile.nmake ...\ui\qt\QtShark.pro
+                                  ;; (Only needs to be run once;
+                                  ;; nmake -f Makefile.nmake  will redo qmake if any
+                                  ;; dependendencies (e.g., QtShark.pro) change.
+
+- Compile & Build
+    nmake -f Makefile.nmake       ;; Wireshark.exe + all DLL's will be in <working-dir>\wireshark-qt
+- Run:
+    <working-dir>\wireshark
+
+- Debug (with Visual Studio debugger)
+    Start Visual Studio;
+    File ! Open ! Project/Solution  ! .../<working-dir>/wireshark-qt/wireshark.exe
+    (Using  Solution Explorer ! Properties ! Environment to
+     add PATH=C:\Qt\4.8.0\bin;%PATH% will pobably be required).
+    ... Debug in the usual manner
+
+
 1.1.3 Linux
 
 Install the Qt libraries and Qt Creator via your package manager or from