diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-11 12:56:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-11 13:29:12 +0200 |
| commit | 2a98afad6eefab6039905f70df7d25537bc5774b (patch) | |
| tree | 974b6863e87a0da86bad55bf9af7e424b57806e5 /src/imports | |
| parent | fb04917e8eb1f7cc5832b2f13ab1d208b0e1014f (diff) | |
| parent | 2433fa45d75cf26add9e7f0ceb8ee439eba68753 (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 'src/imports')
| -rw-r--r-- | src/imports/imports.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index ad33312891..80f493da85 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -25,7 +25,7 @@ qtHaveModule(quick) { qtConfig(quick-particles): \ SUBDIRS += particles - SUBDIRS += shapes + qtConfig(quick-path): SUBDIRS += shapes } qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel |