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/imports/settings | |
| 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/imports/settings')
| -rw-r--r-- | src/imports/settings/settings.pro | 3 |
1 files changed, 0 insertions, 3 deletions
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 |