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>

17 files changed, 26 insertions, 32 deletions

diff --git a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml b/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml
index b41f7846..598fce56 100644
--- a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml
+++ b/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 CircularGaugeStyle {
     tickmarkInset: toPixels(0.04)
diff --git a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml b/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml
index 5caa4204..0c3d9320 100644
--- a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml
+++ b/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Extras 1.4
 
 DashboardGaugeStyle {
     id: fuelGaugeStyle
diff --git a/examples/quick/extras/dashboard/qml/TachometerStyle.qml b/examples/quick/extras/dashboard/qml/TachometerStyle.qml
index 43abbf53..a0f7b6b9 100644
--- a/examples/quick/extras/dashboard/qml/TachometerStyle.qml
+++ b/examples/quick/extras/dashboard/qml/TachometerStyle.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Extras 1.4
 
 DashboardGaugeStyle {
     id: tachometerStyle
diff --git a/examples/quick/extras/dashboard/qml/TurnIndicator.qml b/examples/quick/extras/dashboard/qml/TurnIndicator.qml
index 4978592f..cf9c41db 100644
--- a/examples/quick/extras/dashboard/qml/TurnIndicator.qml
+++ b/examples/quick/extras/dashboard/qml/TurnIndicator.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras.Styles 1.3
 
 Item {
     // This enum is actually keyboard-related, but it serves its purpose
diff --git a/examples/quick/extras/dashboard/qml/dashboard.qml b/examples/quick/extras/dashboard/qml/dashboard.qml
index e7488209..756d96a5 100644
--- a/examples/quick/extras/dashboard/qml/dashboard.qml
+++ b/examples/quick/extras/dashboard/qml/dashboard.qml
@@ -40,10 +40,9 @@
 
 import QtQuick 2.2
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.1
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Extras 1.4
 
 Window {
     id: root
diff --git a/examples/quick/extras/flat/Content.qml b/examples/quick/extras/flat/Content.qml
index e197cd72..2969f730 100644
--- a/examples/quick/extras/flat/Content.qml
+++ b/examples/quick/extras/flat/Content.qml
@@ -40,10 +40,9 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles.Flat 1.0 as Flat
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Extras 1.4
 import QtQuick.XmlListModel 2.0
 
 Item {
diff --git a/examples/quick/extras/flat/main.qml b/examples/quick/extras/flat/main.qml
index e26997d6..aec94c36 100644
--- a/examples/quick/extras/flat/main.qml
+++ b/examples/quick/extras/flat/main.qml
@@ -40,10 +40,9 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles.Flat 1.0 as Flat
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Extras.Private 1.0
 
 ApplicationWindow {
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml b/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml
index abf54193..9993a97a 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml
+++ b/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 CircularGaugeStyle {
     id: root
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml b/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml
index acba4bdc..b7f1b241 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml
+++ b/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 CircularGaugeStyle {
     labelStepSize: 20
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml b/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml
index d25765f3..8e1f34ea 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml
+++ b/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 CircularGaugeStyle {
     id: root
diff --git a/examples/quick/extras/gallery/qml/CircularGaugeView.qml b/examples/quick/extras/gallery/qml/CircularGaugeView.qml
index f89f1d24..cd03ebbe 100644
--- a/examples/quick/extras/gallery/qml/CircularGaugeView.qml
+++ b/examples/quick/extras/gallery/qml/CircularGaugeView.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 1.1
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 
 ControlView {
     id: controlView
diff --git a/examples/quick/extras/gallery/qml/ControlLabel.qml b/examples/quick/extras/gallery/qml/ControlLabel.qml
index 5dba9172..6fdcec11 100644
--- a/examples/quick/extras/gallery/qml/ControlLabel.qml
+++ b/examples/quick/extras/gallery/qml/ControlLabel.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 
 Text {
     font.pixelSize: Math.max(textSingleton.font.pixelSize, Math.min(32, root.toPixels(0.045)))
diff --git a/examples/quick/extras/gallery/qml/PieMenuControlView.qml b/examples/quick/extras/gallery/qml/PieMenuControlView.qml
index a138c178..bbaa8637 100644
--- a/examples/quick/extras/gallery/qml/PieMenuControlView.qml
+++ b/examples/quick/extras/gallery/qml/PieMenuControlView.qml
@@ -41,7 +41,7 @@
 import QtQuick 2.2
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.1
-import QtQuick.Extras 1.3
+import QtQuick.Extras 1.4
 
 Rectangle {
     id: view
diff --git a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml b/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml
index 7667e813..98e04298 100644
--- a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml
+++ b/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 PieMenuStyle {
     backgroundColor: "#222"
diff --git a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml b/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml
index 19941116..02a189d6 100644
--- a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml
+++ b/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls.Styles 1.4
 
 PieMenuStyle {
 }
diff --git a/examples/quick/extras/gallery/qml/StylePicker.qml b/examples/quick/extras/gallery/qml/StylePicker.qml
index 1fcfa55e..f1d2cad2 100644
--- a/examples/quick/extras/gallery/qml/StylePicker.qml
+++ b/examples/quick/extras/gallery/qml/StylePicker.qml
@@ -39,10 +39,9 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.1
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Extras 1.4
 
 ListView {
     id: stylePicker
diff --git a/examples/quick/extras/gallery/qml/gallery.qml b/examples/quick/extras/gallery/qml/gallery.qml
index fe870063..d6b46dc1 100644
--- a/examples/quick/extras/gallery/qml/gallery.qml
+++ b/examples/quick/extras/gallery/qml/gallery.qml
@@ -40,11 +40,10 @@
 
 import QtQuick 2.2
 import QtGraphicalEffects 1.0
-import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.1
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.0
-import QtQuick.Extras 1.3
-import QtQuick.Extras.Styles 1.3
+import QtQuick.Extras 1.4
 import QtQuick.Layouts 1.0
 import QtQuick.Window 2.1