From c913484414415685e20d04b73cabda0cb0b83205 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Mon, 25 Aug 2014 11:38:18 +0200
Subject: [PATCH] [Win64] Make sure ninja is built in 64bit mode as well.
Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
tools/qmake/mkspecs/features/functions.prf | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 88a5aad7a..44ed4f9e6 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -113,7 +113,11 @@ defineReplace(findOrBuildNinja) {
# If we did not find ninja, then we bootstrap it.
!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)
}
--
GitLab