Use the right package name.
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Oct 2013 23:52:29 +0000 (23:52 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 10 Oct 2013 23:52:29 +0000 (23:52 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52521 f5534014-38df-0310-8fa8-9805f1628bb7

config.nmake

index 24fd15cbe0444b5ae1ea4a68f05709d4c63aad0e..65eda43b806d59c42b69267556b25a6953e43b53 100644 (file)
@@ -308,8 +308,8 @@ GTK_INST_VERSION=3.4
 #
 #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX"
 !IF !DEFINED(QT_DIR)
-!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM))
-QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)
+!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
 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
 QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
 !ENDIF
@@ -548,8 +548,8 @@ GTK_INST_VERSION=3.4
 #
 #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX"
 !IF !DEFINED(QT_DIR)
-!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM))
-QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)
+!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
 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
 QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
 !ENDIF