diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
| commit | 60a2c3e453177389c0dfbca9211fa2918755124d (patch) | |
| tree | 0f329b8ae854fa1a17be31a4653bb4b76af46f86 /tools | |
| parent | bbc52bcbb6391c4925df26672eb1f26040c6f67c (diff) | |
| parent | fa74444ed06e4db21b0e9829a5832b886b39d372 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
tools/qmlscene/main.cpp
Change-Id: Idd6e05582ade4def1a3907f9622a8e132bec6bf7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 779b656198..ef4872d1a1 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -9,7 +9,7 @@ qtConfig(qml-devtools) { qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen } -!android|android_app { +qtConfig(thread):!android|android_app { SUBDIRS += \ qml |