Doc & Test: fix syntax of QSettings sub-groups

These examples and .conf files were using two different syntax to create
a subgroup. QSettings may not support one of them and is misbehaving. So
let's use one syntax only and the one that it produces when writing the
output.

This code:

    s.beginGroup(u"Material");
    s.beginGroup(u"Font");
    s.setValue("Family", "Open Sans");
    s.setValue("PixelSize", 20);

Produces:

 [Material]
 Font\Family=Open Sans
 Font\PixelSize=20

Fixes: QTBUG-121035
Change-Id: I76ffba14ece04f24b43efffd17ab7ea941910c19
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit e8e818df993113f7c330f8215dccc24c2790f7c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 450fdee836866cfc8f62f1bc829f27223946f1da)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

6 files changed, 10 insertions, 32 deletions

diff --git a/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf b/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf
index c7fc7a6169..94601428d0 100644
--- a/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf
+++ b/examples/quickcontrols/imagine/automotive/qtquickcontrols2.conf
@@ -3,8 +3,6 @@ Style=Imagine
 
 [Imagine]
 Path=:/imagine-assets
-
-[Imagine\Palette]
-Text=#6affcd
-ButtonText=#6affcd
-WindowText=#6affcd
+Palette\Text=#6affcd
+Palette\ButtonText=#6affcd
+Palette\WindowText=#6affcd
diff --git a/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
index 26fab0a2ce..bb341c7ad6 100644
--- a/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
+++ b/src/quickcontrols/doc/src/qtquickcontrols-configuration.qdoc
@@ -80,17 +80,12 @@
     \section1 Font Configuration
 
     The default \l {Control::font}{font} can be specified in a \c Font sub-group
-    in each style's section in the configuration file. The \c Font sub-group can
-    be defined in two alternative ways:
+    in each style's section in the configuration file:
 
     \code
     [Basic]
     Font\Family=Open Sans
     Font\PixelSize=20
-
-    [Material\Font]
-    Family=Open Sans
-    PixelSize=20
     \endcode
 
     Supported font attributes:
@@ -137,13 +132,6 @@
     Palette\WindowText=#212121
     \endcode
 
-    or:
-    \code
-    [Fusion\Palette]
-    Window=#dedede
-    WindowText=#212121
-    \endcode
-
     See \l [QtQuick]{Palette} QML type for more information.
 
     \section1 Using the Configuration File in a Project
diff --git a/tests/auto/quickcontrols/palette/qtquickcontrols2.conf b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
index c5de6b36dd..97b122c566 100644
--- a/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/palette/qtquickcontrols2.conf
@@ -1,5 +1,3 @@
 [Basic]
 Palette\Base=#efefef
-
-[Basic\Palette]
-Text=#101010
+Palette\Text=#101010
diff --git a/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
index 30cee878be..af51b66f05 100644
--- a/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickmaterialstyleconf/qtquickcontrols2.conf
@@ -4,7 +4,5 @@ Style=Material
 [Material]
 Background=#444444
 Foreground=Red
+Font\Family=Courier
 Font\PixelSize=22
-
-[Material\Font]
-Family=Courier
diff --git a/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
index 0ec1325871..aef058c7d2 100644
--- a/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
+++ b/tests/auto/quickcontrols/qquickuniversalstyleconf/qtquickcontrols2.conf
@@ -4,7 +4,5 @@ Style=Universal
 [Universal]
 Background=#444444
 Foreground=Red
+Font\Family=Courier
 Font\PixelSize=22
-
-[Universal\Font]
-Family=Courier
diff --git a/tests/manual/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf b/tests/manual/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf
index 33eab6a563..df765ea7d2 100644
--- a/tests/manual/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf
+++ b/tests/manual/quickcontrols/imagine/musicplayer/qtquickcontrols2.conf
@@ -3,8 +3,6 @@ Style=Imagine
 
 [Imagine]
 Path=:/imagine-assets
-
-[Imagine\Palette]
-Text=#6b7b89
-ButtonText=#6b7b89
-WindowText=#6b7b89
+Palette\Text=#6b7b89
+Palette\ButtonText=#6b7b89
+Palette\WindowText=#6b7b89