diff options
Diffstat (limited to 'src/imports/settings')
| -rw-r--r-- | src/imports/settings/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/settings/qqmlsettings.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/imports/settings/plugin.cpp b/src/imports/settings/plugin.cpp index c422296446..70d24c12cd 100644 --- a/src/imports/settings/plugin.cpp +++ b/src/imports/settings/plugin.cpp @@ -58,7 +58,7 @@ class QmlSettingsPlugin : public QQmlExtensionPlugin public: QmlSettingsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } - void registerTypes(const char *uri) Q_DECL_OVERRIDE + void registerTypes(const char *uri) override { Q_ASSERT(QByteArray(uri) == QByteArray("Qt.labs.settings")); qmlRegisterType<QQmlSettings>(uri, 1, 0, "Settings"); diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp index ed2f58e7c1..f6040e7a64 100644 --- a/src/imports/settings/qqmlsettings.cpp +++ b/src/imports/settings/qqmlsettings.cpp @@ -189,6 +189,9 @@ QT_BEGIN_NAMESPACE only provides a cleaner settings structure, but also prevents possible conflicts between setting keys. + If several categories are required, use several Settings objects, each with + their own category: + \qml Item { id: panel @@ -200,6 +203,12 @@ QT_BEGIN_NAMESPACE property alias visible: panel.visible // ... } + + Settings { + category: "General" + property alias fontSize: fontSizeSpinBox.value + // ... + } } \endqml |