Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I3878bbf2ac7b62651215938c98ead7171be49c74

1 files changed, 9 insertions, 0 deletions

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