diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-05-12 15:16:23 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-05-12 22:17:53 +0000 |
| commit | 2981ae46adca9f344cbaa04e8a8f8b160f29b969 (patch) | |
| tree | 0c7d939719a3798a746c25b10ee945225a3afb2d /config.nmake | |
| parent | 89e61b9b37daf9226217d7dd2cff1e6e2e5c3b7f (diff) | |
| download | wireshark-2981ae46adca9f344cbaa04e8a8f8b160f29b969.tar.gz | |
Add default paths for the Qt online installer for Windows.
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543
Reviewed-on: https://code.wireshark.org/review/1618
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 797821395e..35c098f3a6 100644 --- a/config.nmake +++ b/config.nmake @@ -346,6 +346,13 @@ 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 +# Qt 5.2.1 web installer default paths +!ELSE IF EXIST(C:\Qt\5.2.1\msvc2010) +QT5_BASE_DIR=C:\Qt\5.2.1\msvc2010 +!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012) +QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012 +!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012_64) +QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012_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 |