QT_DIR → QT5_BASE_DIR. This matches the CMake environment.

svn path=/trunk/; revision=52557

diff --git a/Makefile.nmake b/Makefile.nmake
index edf2b4c8f966e745273f9a849143bf9810b0f126..e012f1bd3bcd4254c75d419ddf74b62b0c72aa01 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -192,7 +192,7 @@ 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
+!IFDEF QT5_BASE_DIR
 EXECUTABLES=$(EXECUTABLES) qtshark.exe
 !ENDIF
 
@@ -556,7 +556,7 @@ clean: clean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd gtk
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-!IFDEF QT_DIR
+!IFDEF QT5_BASE_DIR
        cd ../qt
        -$(MAKE) clean
 !ENDIF
@@ -610,7 +610,7 @@ distclean: distclean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd gtk
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-!IFDEF QT_DIR
+!IFDEF QT5_BASE_DIR
        cd ../qt
        -$(MAKE) distclean
 !ENDIF
@@ -657,7 +657,7 @@ maintainer-clean: maintainer-clean-local
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd gtk
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-!IFDEF QT_DIR
+!IFDEF QT5_BASE_DIR
        cd ../qt
        -$(MAKE) distclean
 !ENDIF
@@ -777,9 +777,9 @@ gtk:: help config.h svnversion.h doxygen
        cd ../..
 
 qt:: help config.h svnversion.h doxygen
-!IFDEF QT_DIR
+!IFDEF QT5_BASE_DIR
        cd ui/qt
-       $(QT_DIR)\bin\qmake CONFIG+=release QtShark.pro
+       $(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro
        nmake
        cd ../..
 !ENDIF
@@ -858,8 +858,8 @@ REQUIRED_TOOLS=\
        peflags \
        $(PERL) \
        $(PYTHON)       \
-!IFDEF QT_DIR
-       --windowsonly $(QT_DIR)\bin\qmake \
+!IFDEF QT5_BASE_DIR
+       --windowsonly $(QT5_BASE_DIR)\bin\qmake \
 !ENDIF
        sed     \
        unzip   \
@@ -917,7 +917,7 @@ process_libs:
        @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
                . WinPcap_$(PCAP_VERSION).exe
-!IFNDEF QT_DIR
+!IFNDEF QT5_BASE_DIR
 !MESSAGE Can't find Qt. This will become a problem at some point.
 !ENDIF
 !IFDEF GTK_DIR

diff --git a/config.nmake b/config.nmake
index d938cf59a3c5a6ed8ac78e18b4476cbcb3eed6dc..1e5f02468896a642026bf65160ac7650a0a3916e 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -300,23 +300,23 @@ GTK_INST_VERSION=3.4
 # Recommended: Qt
 #
 # This must point to a top-level Qt directory. QMake should be in
-# $(QT_DIR)\bin
+# $(QT5_BASE_DIR)\bin
 #
 # Qt's various paths are hardcoded but with care you can relocate your
 # installation directory:
 # http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library
 #
-#QT_DIR=output of "qmake -query QT_INSTALL_PREFIX"
-!IF !DEFINED(QT_DIR)
+#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX"
+!IF !DEFINED(QT5_BASE_DIR)
 # Wireshark custom
 !IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws)
-QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
+QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
 # Digia official
 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
-QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
+QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
 # Digia official, installed in $(WIRESHARK_LIB_DIR)
 !ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010)
-QT_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
+QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
 !ENDIF
 !ENDIF
 
@@ -545,23 +545,23 @@ GTK_INST_VERSION=3.4
 # Recommended: Qt
 #
 # This must point to a top-level Qt directory. QMake should be in
-# $(QT_DIR)\bin
+# $(QT5_BASE_DIR)\bin
 #
 # Qt's various paths are hardcoded but with care you can relocate your
 # installation directory:
 # http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library
 #
-#QT_DIR=output of "qmake -query QT_INSTALL_PREFIX"
-!IF !DEFINED(QT_DIR)
+#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX"
+!IF !DEFINED(QT5_BASE_DIR)
 # Wireshark custom
 !IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws)
-QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
+QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
 # Digia official
 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
-QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
+QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
 # Digia official, installed in $(WIRESHARK_LIB_DIR)
 !ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010)
-QT_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
+QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
 !ENDIF
 !ENDIF