Merge Extras' styling system into Controls'.

- Removes the duplicated style settings functionality in Extras and
  simplifies the installed styles directory structure.

- Extras' Base style is now part of Controls' Base style, eliminating
  the need for a separate QtQuick.Extras.Styles import. The cost of
  doing this should be negligible: a few QML files and two images.

  If we didn't merge Extras' Baste style into Controls', we'd need
  extras-specific code in qquickcontrolssettings, as the default style
  search path is:

  qml/QtQuick/Controls/Styles/

  Whereas the Extras Base style would be in:

  qml/QtQuick/Extras/Styles/

  The Extras Base style can't go into Controls' Base style directory,
  either, because otherwise we'd have two qmldir files there.

  The Flat style doesn't have this problem because it is all contained
  in one plugin and gets installed into its own Flat/ folder.

- Documentation now lists the Extras controls as \since QtQuick.Extras
  1.4.

- Adds the customcontrolsstyle auto test to ensure that custom styling
  is tested.

Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 12 insertions, 14 deletions

diff --git a/src/extras/CircularGauge.qml b/src/extras/CircularGauge.qml
index 7a91f8bf..426d6e49 100644
--- a/src/extras/CircularGauge.qml
+++ b/src/extras/CircularGauge.qml
@@ -36,15 +36,15 @@
 
 import QtQuick 2.2
 // Workaround for QTBUG-37751; we need this import for RangeModel, although we shouldn't.
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls.Private 1.0
 import QtQuick.Extras.Private 1.0
-import QtQuick.Extras.Styles 1.3
 
 /*!
     \qmltype CircularGauge
     \inqmlmodule QtQuick.Extras
-    \since QtQuick.Extras 1.0
+    \since 5.5
     \ingroup extras
     \ingroup extras-non-interactive
     \brief A gauge that displays a value within a range along an arc.
@@ -58,9 +58,9 @@ import QtQuick.Extras.Styles 1.3
     The minimum and maximum values displayable by the gauge can be set with the
     \l minimumValue and \l maximumValue properties. The angle at which these
     values are displayed can be set with the
-    \l {QtQuick.Extras.Styles::CircularGaugeStyle::}{minimumValueAngle} and
-    \l {QtQuick.Extras.Styles::CircularGaugeStyle::}{maximumValueAngle} properties of
-    \l {QtQuick.Extras.Styles::}{CircularGaugeStyle}.
+    \l {QtQuick.Controls.Styles::CircularGaugeStyle::}{minimumValueAngle} and
+    \l {QtQuick.Controls.Styles::CircularGaugeStyle::}{maximumValueAngle} properties of
+    \l {QtQuick.Controls.Styles::}{CircularGaugeStyle}.
 
     Example:
     \code
@@ -89,13 +89,13 @@ import QtQuick.Extras.Styles 1.3
     \endcode
 
     You can create a custom appearance for a CircularGauge by assigning a
-    \l {QtQuick.Extras.Styles::}{CircularGaugeStyle}.
+    \l {QtQuick.Controls.Styles::}{CircularGaugeStyle}.
 */
 
 Control {
     id: circularGauge
 
-    style: Qt.createComponent(StyleSettings.style + "/CircularGaugeStyle.qml", circularGauge)
+    style: Settings.styleComponent(Settings.style, "CircularGaugeStyle.qml", circularGauge)
 
     /*!
         \qmlproperty real CircularGauge::minimumValue
@@ -131,20 +131,18 @@ Control {
     property alias stepSize: range.stepSize
 
     /*!
-        \since 1.2
-
         This property determines whether or not the gauge displays tickmarks,
         minor tickmarks, and labels.
 
         For more fine-grained control over what is displayed, the following
         style components of
-        \l {QtQuick.Extras.Styles::}{CircularGaugeStyle} can be
+        \l {QtQuick.Controls.Styles::}{CircularGaugeStyle} can be
         used:
 
         \list
-            \li \l {QtQuick.Extras.Styles::CircularGaugeStyle::tickmark}{tickmark}
-            \li \l {QtQuick.Extras.Styles::CircularGaugeStyle::minorTickmark}{minorTickmark}
-            \li \l {QtQuick.Extras.Styles::CircularGaugeStyle::tickmarkLabel}{tickmarkLabel}
+            \li \l {QtQuick.Controls.Styles::CircularGaugeStyle::tickmark}{tickmark}
+            \li \l {QtQuick.Controls.Styles::CircularGaugeStyle::minorTickmark}{minorTickmark}
+            \li \l {QtQuick.Controls.Styles::CircularGaugeStyle::tickmarkLabel}{tickmarkLabel}
         \endlist
     */
     property bool tickmarksVisible: true