Commit 747ab86a authored by Michael Brüning's avatar Michael Brüning Committed by Michael Bruning
Browse files

[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: default avatarJocelyn Turcotte <jocelyn.turcotte@digia.com>
Showing with 2 additions and 11 deletions
defineTest(isPlatformSupported) { defineTest(isPlatformSupported) {
static: return(false) static: return(false)
osx:lessThan(QMAKE_XCODE_VERSION, 5): return(false) osx:lessThan(QMAKE_XCODE_VERSION, 5): return(false)
win32 { win32: !contains(QT_CONFIG, angle): return(false)
equals(QT_ARCH, x86_64): return(false)
!contains(QT_CONFIG, angle): return(false)
}
linux-g++|win32-msvc2013|macx-clang: return(true) linux-g++|win32-msvc2013|macx-clang: return(true)
return(false) return(false)
...@@ -112,12 +109,6 @@ defineReplace(findOrBuildNinja) { ...@@ -112,12 +109,6 @@ defineReplace(findOrBuildNinja) {
win32: out = $$system_path($${out}.exe) win32: out = $$system_path($${out}.exe)
# If we did not find ninja, then we bootstrap it. # If we did not find ninja, then we bootstrap it.
!exists($$out) { !exists($$out): system("python $$dirname(out)/bootstrap.py")
contains(DEFINES, WIN64) {
system("python $$dirname(out)/bootstrap.py --x64")
} else {
system("python $$dirname(out)/bootstrap.py")
}
}
return($$out) return($$out)
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment