summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-22 11:55:22 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-22 11:59:01 +0200
commitdc1a189e7f51e19db8a9b1404d6701bbfcf8bf66 (patch)
tree2f59c20e926ca0f00f063fb6ad94edf78df04747
parent8e478ab97500cfd81c090074cf0cd522854a83a5 (diff)
Disable the Windows build on 64bit or non-angle configured Qt
Those configurations should be re-enabled once we support them properly. Change-Id: Id8019df8e0b34a2fb1a411780689f28def50546f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--tools/qmake/mkspecs/features/functions.prf4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index c6b712a7..76243a3e 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -1,6 +1,10 @@
defineTest(isPlatformSupported) {
static: return(false)
osx:lessThan(QMAKE_XCODE_VERSION, 5): return(false)
+ win32 {
+ equals(QT_ARCH, x86_64): return(false)
+ !contains(QT_CONFIG, angle): return(false)
+ }
linux-g++|win32-msvc2013|macx-clang: return(true)
return(false)