summaryrefslogtreecommitdiffstats
path: root/src/buildtools
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 18:04:17 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-18 18:04:17 +0100
commit903769cf01d0bcb948f490fef462a4d4a5bcc35e (patch)
treed146af8003e09236de2b908c1f947e6cf335db19 /src/buildtools
parent414f57b955a6e5cfe9315e9a443f4b3e4a36f898 (diff)
parent685ce77cb6c696fb062ff4ab967b6ae553821a2d (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Diffstat (limited to 'src/buildtools')
-rw-r--r--src/buildtools/buildtools.pro14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/buildtools/buildtools.pro b/src/buildtools/buildtools.pro
index 8985bbb25..1366d18d5 100644
--- a/src/buildtools/buildtools.pro
+++ b/src/buildtools/buildtools.pro
@@ -1,12 +1,5 @@
TEMPLATE = subdirs
-ninja.file = ninja.pro
-SUBDIRS += ninja
-
-gn.file = gn.pro
-gn.depends = ninja
-SUBDIRS += gn
-
linux {
# configure_host.pro and configure_target.pro are phony pro files that
# extract things like compiler and linker from qmake.
@@ -18,3 +11,10 @@ linux {
SUBDIRS += configure_host configure_target
}
+
+ninja.file = ninja.pro
+SUBDIRS += ninja
+
+gn.file = gn.pro
+gn.depends = ninja
+SUBDIRS += gn