diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-11-01 11:15:45 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-11-01 11:31:41 +0000 |
commit | 65e1dd24c2148bfb9a9e014dfe660c56a0756528 (patch) | |
tree | 03cf668ee01d73bbddbdc032f190bdc34965b9d3 | |
parent | e0e99ebc5e27f8700bea711fc0c5d122b88447a1 (diff) |
Imports: Build settings depending on feature settings
Fix warning:
qtdeclarative/src/imports/settings/settings.pro:1: Cannot find feature qfeatures
Change-Id: I215801bbadd1a07deef69bb38b0ac31b8da4d64e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/imports/imports.pro | 3 | ||||
-rw-r--r-- | src/imports/settings/settings.pro | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index affc1db2c0..cad02a2980 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -6,9 +6,10 @@ SUBDIRS += \ folderlistmodel \ localstorage \ models \ - settings \ statemachine +qtConfig(settings): SUBDIRS += settings + qtHaveModule(quick) { SUBDIRS += \ layouts \ diff --git a/src/imports/settings/settings.pro b/src/imports/settings/settings.pro index 3d7c9c31b8..29229f59cb 100644 --- a/src/imports/settings/settings.pro +++ b/src/imports/settings/settings.pro @@ -1,6 +1,3 @@ -load(qfeatures) -requires(!contains(QT_DISABLED_FEATURES, settings)) - CXX_MODULE = qml TARGET = qmlsettingsplugin TARGETPATH = Qt/labs/settings |