diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 01:01:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-14 11:24:11 +0100 |
| commit | 8a22c92b55b5d015e372fe5be0633c3935af4218 (patch) | |
| tree | 02ad52cf1e7c3ed35b10156dd250d3cc7f6b7068 /src/quick/configure.json | |
| parent | 3ca659657ccaf0d850e661c9312e0f98e153c9ff (diff) | |
| parent | 3dc5b937c4e9acf83ee54e870390c22f341c29c8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/folderlistmodel/plugin.cpp
src/imports/layouts/plugin.cpp
src/imports/localstorage/plugin.cpp
src/imports/models/plugin.cpp
src/imports/particles/plugin.cpp
src/imports/qtqml/plugin.cpp
src/imports/qtquick2/plugin.cpp
src/imports/shapes/plugin.cpp
src/imports/statemachine/plugin.cpp
src/imports/testlib/main.cpp
src/imports/wavefrontmesh/plugin.cpp
src/imports/window/plugin.cpp
src/imports/workerscript/plugin.cpp
src/qml/jsruntime/qv4sequenceobject.cpp
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
src/qmlmodels/qqmlmodelsmodule_p.h
src/qmlworkerscript/qqmlworkerscriptmodule.cpp
src/qmlworkerscript/qqmlworkerscriptmodule_p.h
src/quick/items/qquickitemsmodule.cpp
Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7
Diffstat (limited to 'src/quick/configure.json')
| -rw-r--r-- | src/quick/configure.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 84b9188605..6cd3099a20 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -3,9 +3,11 @@ "depends": [ "core-private", "qml-private", + "gui", "gui-private", "qmlmodels-private" ], + "condition": "module.gui", "testDir": "../../config.tests", "commandline": { |