From b3c844fa64680175bf0fe6a6f731d0a9f9eec113 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 8 Oct 2013 23:03:56 +0000
Subject: [PATCH] Add an initial Qt configuration and makefile targets.

svn path=/trunk/; revision=52456
---
 Makefile.nmake | 19 +++++++++++++++++++
 config.nmake   | 20 ++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Makefile.nmake b/Makefile.nmake
index ad09fe9979..17528cee30 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -192,6 +192,10 @@ EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \
 	capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe \
 	reordercap.exe dumpcap.exe dftest.exe
 
+!IFDEF QT_DIR
+EXECUTABLES=$(EXECUTABLES) qtshark.exe
+!ENDIF
+
 RESOURCES=image\wireshark.res image\file_dlg_win32.res \
 	image\libwireshark.res image\tshark.res image\capinfos.res \
 	image\editcap.res image\mergecap.res image\text2pcap.res \
@@ -309,6 +313,8 @@ wireshark.exe	: $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui gtk w
 	mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1
 !ENDIF
 
+qtshark.exe	: install-generated-files $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui qt wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins
+
 tshark.exe	: $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins
 	@echo Linking $@
 	$(LINK) @<<
@@ -536,6 +542,7 @@ clean-local:
 		libwsutil.dll \
 		wireshark.bsc
 	rm -rf $(INSTALL_DIR)
+	rm -rf wireshark-qt-release
 
 clean: clean-local
 	cd asn1
@@ -550,6 +557,8 @@ clean: clean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../qt
+	$(MAKE) clean
 	cd ../win32
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../cli
@@ -600,6 +609,8 @@ distclean: distclean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../qt
+	$(MAKE) distclean
 	cd ../win32
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../cli
@@ -643,6 +654,8 @@ maintainer-clean: maintainer-clean-local
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ../qt
+	$(MAKE) distclean
 	cd ../win32
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../cli
@@ -758,6 +771,12 @@ gtk:: help config.h svnversion.h doxygen
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib
 	cd ../..
 
+qt:: help config.h svnversion.h doxygen
+	cd ui/qt
+	$(QT_DIR)\bin\qmake CONFIG+=release QtShark.pro
+	nmake
+	cd ../..
+
 win32::
 	cd ui/win32
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib
diff --git a/config.nmake b/config.nmake
index 3cca0fbb2b..e913dfb085 100644
--- a/config.nmake
+++ b/config.nmake
@@ -297,7 +297,15 @@ GTK_INST_VERSION=3.4
 !ENDIF
 
 #
-# Optional: WinPcap developer's pack to capture network traffic.
+# Recommended: Qt
+#
+# This must point to a top-level Qt directory. QMake should be in
+# $(QT_DIR)\bin
+#
+#QT_DIR=C:\Qt\5.1.1-MSVC2010-win32
+
+#
+# Recommended: WinPcap developer's pack to capture network traffic.
 #
 # If you have the WinPcap developer's pack (at least version 3.0),
 # set this to the directory in which the WinPcap developer's pack resides.
@@ -518,7 +526,15 @@ GTK_INST_VERSION=3.4
 !ENDIF
 
 #
-# Optional: WinPcap developer's pack to capture network traffic.
+# Recommended: Qt
+#
+# This must point to a top-level Qt directory. QMake should be in
+# $(QT_DIR)\bin
+#
+#QT_DIR=C:\Qt\5.1.1-MSVC2010-win64
+
+#
+# Recommended: WinPcap developer's pack to capture network traffic.
 #
 # If you have the WinPcap developer's pack (at least version 3.0),
 # set this to the directory in which the WinPcap developer's pack resides.