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>

16 files changed, 23 insertions, 23 deletions

diff --git a/src/extras/Styles/Flat/ApplicationWindowStyle.qml b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
index 8ae620b0..248e39d4 100644
--- a/src/extras/Styles/Flat/ApplicationWindowStyle.qml
+++ b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 import QtQuick 2.2
 import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.3 as Base
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 
 Base.ApplicationWindowStyle {
diff --git a/src/extras/Styles/Flat/CalendarStyle.qml b/src/extras/Styles/Flat/CalendarStyle.qml
index b41e3c8e..7c42507a 100644
--- a/src/extras/Styles/Flat/CalendarStyle.qml
+++ b/src/extras/Styles/Flat/CalendarStyle.qml
@@ -39,7 +39,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private 1.0
 import QtQuick.Extras.Private.CppUtils 1.0
 
diff --git a/src/extras/Styles/Flat/CircularButtonStyle.qml b/src/extras/Styles/Flat/CircularButtonStyle.qml
index 774870e6..def48daa 100644
--- a/src/extras/Styles/Flat/CircularButtonStyle.qml
+++ b/src/extras/Styles/Flat/CircularButtonStyle.qml
@@ -33,6 +33,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick.Extras.Styles 1.3 as Base
+import QtQuick.Controls.Styles 1.4 as Base
 
 Base.CircularButtonStyle { }
diff --git a/src/extras/Styles/Flat/CircularGaugeStyle.qml b/src/extras/Styles/Flat/CircularGaugeStyle.qml
index d18cdea5..cd6d7f1b 100644
--- a/src/extras/Styles/Flat/CircularGaugeStyle.qml
+++ b/src/extras/Styles/Flat/CircularGaugeStyle.qml
@@ -35,10 +35,10 @@
 ****************************************************************************/
 
 import QtQuick 2.2
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Extras.Private 1.0
 import QtQuick.Extras.Private.CppUtils 1.1
-import QtQuick.Extras.Styles 1.3 as Base
 
 Base.CircularGaugeStyle {
     id: circularGaugeStyle
diff --git a/src/extras/Styles/Flat/CircularTickmarkLabelStyle.qml b/src/extras/Styles/Flat/CircularTickmarkLabelStyle.qml
index 8127608b..4e6649e7 100644
--- a/src/extras/Styles/Flat/CircularTickmarkLabelStyle.qml
+++ b/src/extras/Styles/Flat/CircularTickmarkLabelStyle.qml
@@ -34,6 +34,6 @@
 **
 ****************************************************************************/
 
-import QtQuick.Extras.Styles 1.3 as Base
+import QtQuick.Controls.Styles 1.4 as Base
 
 Base.CircularTickmarkLabelStyle {}
diff --git a/src/extras/Styles/Flat/DelayButtonStyle.qml b/src/extras/Styles/Flat/DelayButtonStyle.qml
index 2e438497..619cc19b 100644
--- a/src/extras/Styles/Flat/DelayButtonStyle.qml
+++ b/src/extras/Styles/Flat/DelayButtonStyle.qml
@@ -35,10 +35,10 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras.Styles 1.1 as Base
 import QtQuick.Extras.Private 1.0
 import QtQuick.Extras.Private.CppUtils 1.1
 
diff --git a/src/extras/Styles/Flat/DialStyle.qml b/src/extras/Styles/Flat/DialStyle.qml
index 3e841d9b..ebc53f0a 100644
--- a/src/extras/Styles/Flat/DialStyle.qml
+++ b/src/extras/Styles/Flat/DialStyle.qml
@@ -35,11 +35,11 @@
 ****************************************************************************/
 
 import QtQuick 2.2
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private 1.0
 import QtQuick.Extras.Private.CppUtils 1.1
-import QtQuick.Extras.Styles 1.3 as Base
 
 Base.DialStyle {
     id: dialStyle
diff --git a/src/extras/Styles/Flat/GaugeStyle.qml b/src/extras/Styles/Flat/GaugeStyle.qml
index d5bf986b..8378571b 100644
--- a/src/extras/Styles/Flat/GaugeStyle.qml
+++ b/src/extras/Styles/Flat/GaugeStyle.qml
@@ -35,9 +35,9 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
-import QtQuick.Extras.Styles 1.3 as Base
 import QtQuick.Extras.Private 1.0
 
 Base.GaugeStyle {
diff --git a/src/extras/Styles/Flat/PieMenuStyle.qml b/src/extras/Styles/Flat/PieMenuStyle.qml
index 9b314610..10d3fa28 100644
--- a/src/extras/Styles/Flat/PieMenuStyle.qml
+++ b/src/extras/Styles/Flat/PieMenuStyle.qml
@@ -35,8 +35,8 @@
 ****************************************************************************/
 
 import QtQuick 2.3
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
-import QtQuick.Extras.Styles 1.3 as Base
 import QtQuick.Extras.Private 1.0
 
 Base.PieMenuStyle {
diff --git a/src/extras/Styles/Flat/ProgressBarStyle.qml b/src/extras/Styles/Flat/ProgressBarStyle.qml
index f0b5bdd4..bf2b0ef6 100644
--- a/src/extras/Styles/Flat/ProgressBarStyle.qml
+++ b/src/extras/Styles/Flat/ProgressBarStyle.qml
@@ -39,7 +39,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private.CppUtils 1.1
 
 Base.ProgressBarStyle {
diff --git a/src/extras/Styles/Flat/RadioButtonStyle.qml b/src/extras/Styles/Flat/RadioButtonStyle.qml
index 779e8636..5061697d 100644
--- a/src/extras/Styles/Flat/RadioButtonStyle.qml
+++ b/src/extras/Styles/Flat/RadioButtonStyle.qml
@@ -38,7 +38,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 
 Base.RadioButtonStyle {
     spacing: Math.round(8 * FlatStyle.scaleFactor)
diff --git a/src/extras/Styles/Flat/SliderStyle.qml b/src/extras/Styles/Flat/SliderStyle.qml
index 191612c5..779ac1b6 100644
--- a/src/extras/Styles/Flat/SliderStyle.qml
+++ b/src/extras/Styles/Flat/SliderStyle.qml
@@ -39,7 +39,7 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private 1.0
 
 Base.SliderStyle {
diff --git a/src/extras/Styles/Flat/StatusIndicatorStyle.qml b/src/extras/Styles/Flat/StatusIndicatorStyle.qml
index fb527665..1c1c6bea 100644
--- a/src/extras/Styles/Flat/StatusIndicatorStyle.qml
+++ b/src/extras/Styles/Flat/StatusIndicatorStyle.qml
@@ -35,10 +35,10 @@
 ****************************************************************************/
 
 import QtQuick 2.3
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
-import QtQuick.Extras.Styles 1.3 as Base
 import QtQuick.Extras.Private 1.0
 import QtQuick.Extras.Private.CppUtils 1.0
 
diff --git a/src/extras/Styles/Flat/ToggleButtonStyle.qml b/src/extras/Styles/Flat/ToggleButtonStyle.qml
index 5cbb0a5d..8c5315af 100644
--- a/src/extras/Styles/Flat/ToggleButtonStyle.qml
+++ b/src/extras/Styles/Flat/ToggleButtonStyle.qml
@@ -35,12 +35,12 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Styles.Flat 1.0
 import QtQuick.Controls.Private 1.0
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private 1.0
-import QtQuick.Extras.Styles 1.3 as Base
 
 Base.ToggleButtonStyle {
     label: Label {
diff --git a/src/extras/Styles/Flat/TumblerStyle.qml b/src/extras/Styles/Flat/TumblerStyle.qml
index cede9fee..3be7f6a0 100644
--- a/src/extras/Styles/Flat/TumblerStyle.qml
+++ b/src/extras/Styles/Flat/TumblerStyle.qml
@@ -35,10 +35,10 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4 as Base
 import QtQuick.Controls.Private 1.0
 import QtQuick.Controls.Styles.Flat 1.0
-import QtQuick.Extras.Styles 1.3 as Base
 
 Base.TumblerStyle {
     id: tumblerStyle
diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp
index e3bffd5c..db464c38 100644
--- a/src/extras/Styles/Flat/flatstyleplugin.cpp
+++ b/src/extras/Styles/Flat/flatstyleplugin.cpp
@@ -56,7 +56,7 @@ extern "C" {
 
     Q_DECL_EXPORT const char* qt_quick_controls_style_path()
     {
-        return "qrc:/ExtrasImports/QtQuick/Controls/Styles/";
+        return ":/ExtrasImports/QtQuick/Controls/Styles/Flat";
     }
 }