diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 11:01:45 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 11:01:45 +0100 |
| commit | da5083c11df4d9a6decd8d724098b6f108c4ab35 (patch) | |
| tree | ee331004123ef2795025637c2905d9719f95f317 /src/plugins/plugins.pro | |
| parent | 462904396454ed0ee931c2a8f2b02c8a6508965a (diff) | |
| parent | ef502bd71a0d81f1428263a11c38cd7c893ac515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmljs/qmljs.cpp
Change-Id: Ifa9e74bdb780eaff22fbc9ba1c514d0078a3fb29
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 11c8641e21..2467239be2 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-qml-debug):SUBDIRS += qmltooling -SUBDIRS += scenegraph +qtHaveModule(quick):SUBDIRS += scenegraph |