diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-07-24 17:27:33 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-25 00:28:47 +0000 |
| commit | 5688c8a4ce5448e8b6b1e16cb8dcd77cfe04a8d1 (patch) | |
| tree | f5d0ca7c68dc86538d863a8bdb7461ee9a59a685 /config.nmake | |
| parent | cca0fd35fe7c0b5fa660d1a7c8a93ae11376d6b3 (diff) | |
Add the default directores used by the Qt Online Installer for Qt 5.3.
Change-Id: Ia81ce10318b34f6af68862622a63c64e2883a937
Reviewed-on: https://code.wireshark.org/review/3191
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 8a7ab9c78d..38e44b9f72 100644 --- a/config.nmake +++ b/config.nmake @@ -337,6 +337,8 @@ QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012 QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012_64 !ELSE IF EXIST(C:\Qt\Qt5.3.0\5.3\msvc2013) QT5_BASE_DIR=C:\Qt\Qt5.3.0\5.3\msvc2013 +!ELSE IF EXIST(C:\Qt\5.3\msvc2013) +QT5_BASE_DIR=C:\Qt\5.3\msvc2013 # Digia official, installed in $(WIRESHARK_LIB_DIR) !ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 @@ -581,6 +583,8 @@ 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) QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 +!ELSE IF EXIST(C:\Qt\5.3\msvc2013_64) +QT5_BASE_DIR=C:\Qt\5.3\msvc2013_64 # Digia official, installed in $(WIRESHARK_LIB_DIR) !ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 |