diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
| commit | cc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (patch) | |
| tree | 7314014389e227bd7c9b28d97eebcd072e4852a2 /src/imports/settings | |
| parent | cb2ac154273a8c07a1e4a14246ae22f6e0deaeda (diff) | |
| parent | 0a74dc69b4c57a15da90be29b598371dfa63f7ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4managed_p.h
Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
Diffstat (limited to 'src/imports/settings')
| -rw-r--r-- | src/imports/settings/settings.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/settings/settings.pro b/src/imports/settings/settings.pro index 29229f59cb..3d7c9c31b8 100644 --- a/src/imports/settings/settings.pro +++ b/src/imports/settings/settings.pro @@ -1,3 +1,6 @@ +load(qfeatures) +requires(!contains(QT_DISABLED_FEATURES, settings)) + CXX_MODULE = qml TARGET = qmlsettingsplugin TARGETPATH = Qt/labs/settings |