diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-12 00:12:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-12 00:12:24 +0000 |
| commit | fcff2c96e6a30dda03f1f359c49a679e1432f672 (patch) | |
| tree | 28fa45de76d6d6c8e409e4c28bf14d3de854e469 /config.nmake | |
| parent | 383ed6465ac88d7e09e376596ac0bbf5ff758576 (diff) | |
QT_DIR → QT5_BASE_DIR. This matches the CMake environment.
svn path=/trunk/; revision=52557
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config.nmake b/config.nmake index d938cf59a3..1e5f024688 100644 --- 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 |