summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-01-05 14:31:47 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-01-07 09:17:27 +0100
commitd74d0a3b304b32f793cfd745c632c404a1c39b42 (patch)
tree5f8b9fbacf00b488e82eca0c863776e2544af7c0
parent6796f2337ee31b4b4f07eaa54d868b999c39233a (diff)
Disable ANGLE builds for MSVC <= 2008.
Task-number: QTBUG-43475 Change-Id: If0f68ed6823564fd67219812334256936031f35f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--tools/configure/configureapp.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 105a9ef04c..6e9d4aa80b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2101,6 +2101,11 @@ bool Configure::checkAngleAvailability(QString *errorMessage /* = 0 */) const
// it is also present in MinGW.
const QString directXSdk = Environment::detectDirectXSdk();
const Compiler compiler = Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]);
+ if (compiler >= CC_NET2003 && compiler <= CC_NET2008) {
+ if (errorMessage)
+ *errorMessage = QStringLiteral("ANGLE is no longer supported for this compiler.");
+ return false;
+ }
if (compiler < CC_NET2012 && directXSdk.isEmpty()) {
if (errorMessage)
*errorMessage = QStringLiteral("There is no Direct X SDK installed or the environment variable \"DXSDK_DIR\" is not set.");