summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)
}