From dc1a189e7f51e19db8a9b1404d6701bbfcf8bf66 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 22 Aug 2014 11:55:22 +0200 Subject: 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 --- tools/qmake/mkspecs/features/functions.prf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index c6b712a7f..76243a3e6 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) -- cgit v1.2.3