aboutsummaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-05-11 12:56:57 +0200
committerLiang Qi <liang.qi@qt.io>2018-05-11 13:29:12 +0200
commit2a98afad6eefab6039905f70df7d25537bc5774b (patch)
tree974b6863e87a0da86bad55bf9af7e424b57806e5 /tools/tools.pro
parentfb04917e8eb1f7cc5832b2f13ab1d208b0e1014f (diff)
parent2433fa45d75cf26add9e7f0ceb8ee439eba68753 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: src/qml/compiler/qv4compilerscanfunctions.cpp tools/tools.pro Done-with: Lars Knoll <lars.knoll@qt.io> Change-Id: Ia77ee6ede6fc9760ce5a03d68079579a63e5a02f
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 23d5cb5299..d35605b5ae 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,7 +6,7 @@ qtConfig(qml-devtools) {
qmlmin \
qmlimportscanner
- qtConfig(commandlineparser): SUBDIRS += qmlcachegen
+ qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen
}
!android|android_app {