summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-09-05 11:36:33 +0200
committerMichael Bruning <michael.bruning@digia.com>2014-09-05 11:39:19 +0200
commit747ab86acec5c2662a2631985762d468891d6801 (patch)
treed946b5736797c4fa064680f10f649b9e5ae6aca6
parentf57d74bf42bbeef2565e69fef45e1c0b55e89cbb (diff)
[Win64] Do not skip 64 bit builds on Windows.
Chromium has enabled this in the 37 based branch and it worked with Qt WebEngine as well. Change-Id: Idb1f9a2133be645cd044c9f0163cc87f6ae8e474 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--tools/qmake/mkspecs/features/functions.prf13
1 files changed, 2 insertions, 11 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 44ed4f9e..3ee4518c 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -1,10 +1,7 @@
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)
- }
+ win32: !contains(QT_CONFIG, angle): return(false)
linux-g++|win32-msvc2013|macx-clang: return(true)
return(false)
@@ -112,12 +109,6 @@ defineReplace(findOrBuildNinja) {
win32: out = $$system_path($${out}.exe)
# If we did not find ninja, then we bootstrap it.
- !exists($$out) {
- contains(DEFINES, WIN64) {
- system("python $$dirname(out)/bootstrap.py --x64")
- } else {
- system("python $$dirname(out)/bootstrap.py")
- }
- }
+ !exists($$out): system("python $$dirname(out)/bootstrap.py")
return($$out)
}