Move Styles and Private under controls

Register the C++ private API from the controls plugin. The
private plugin is not needed anymore.

The Controls "submodules" Styles and Private are moved to
the controls subfolder in the sources tree.

Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

99 files changed, 228 insertions, 259 deletions

diff --git a/src/private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml
index 02348b717..02348b717 100644
--- a/src/private/AbstractCheckable.qml
+++ b/src/controls/Private/AbstractCheckable.qml
diff --git a/src/private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index f07aea863..f07aea863 100644
--- a/src/private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
diff --git a/src/private/Control.qml b/src/controls/Private/Control.qml
index 05916c0a7..05916c0a7 100644
--- a/src/private/Control.qml
+++ b/src/controls/Private/Control.qml
diff --git a/src/private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml
index 0bf9174a1..0bf9174a1 100644
--- a/src/private/FocusFrame.qml
+++ b/src/controls/Private/FocusFrame.qml
diff --git a/src/private/ModalPopupBehavior.qml b/src/controls/Private/ModalPopupBehavior.qml
index 1c6db2ff1..1c6db2ff1 100644
--- a/src/private/ModalPopupBehavior.qml
+++ b/src/controls/Private/ModalPopupBehavior.qml
diff --git a/src/private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml
index c21d6562f..c21d6562f 100644
--- a/src/private/ScrollBar.qml
+++ b/src/controls/Private/ScrollBar.qml
diff --git a/src/private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 791c5e020..791c5e020 100644
--- a/src/private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
diff --git a/src/private/StackView.js b/src/controls/Private/StackView.js
index fa9bb08e8..fa9bb08e8 100644
--- a/src/private/StackView.js
+++ b/src/controls/Private/StackView.js
diff --git a/src/private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml
index 6cc1c6834..6cc1c6834 100644
--- a/src/private/StackViewSlideDelegate.qml
+++ b/src/controls/Private/StackViewSlideDelegate.qml
diff --git a/src/private/Style.qml b/src/controls/Private/Style.qml
index 6b4c08ef7..6b4c08ef7 100644
--- a/src/private/Style.qml
+++ b/src/controls/Private/Style.qml
diff --git a/src/private/TabBar.qml b/src/controls/Private/TabBar.qml
index 8341c9227..8341c9227 100644
--- a/src/private/TabBar.qml
+++ b/src/controls/Private/TabBar.qml
diff --git a/src/private/private.pri b/src/controls/Private/private.pri
index 94d313c31..bd001c0ab 100644
--- a/src/private/private.pri
+++ b/src/controls/Private/private.pri
@@ -22,3 +22,21 @@ qtHaveModule(widgets) {
     HEADERS += $$PWD/qquickstyleitem_p.h
     SOURCES += $$PWD/qquickstyleitem.cpp
 }
+
+# private qml files
+PRIVATE_QML_FILES += \
+    $$PWD/AbstractCheckable.qml \
+    $$PWD/TabBar.qml \
+    $$PWD/BasicButton.qml \
+    $$PWD/Control.qml \
+    $$PWD/Style.qml \
+    $$PWD/style.js \
+    $$PWD/ModalPopupBehavior.qml \
+    $$PWD/StackViewSlideDelegate.qml \
+    $$PWD/StackView.js \
+    $$PWD/ScrollViewHelper.qml \
+    $$PWD/ScrollBar.qml \
+    $$PWD/FocusFrame.qml \
+    $$PWD/qmldir
+
+QML_FILES += $$PRIVATE_QML_FILES
diff --git a/src/private/qmldir b/src/controls/Private/qmldir
index 817e88a0f..1ee66461b 100644
--- a/src/private/qmldir
+++ b/src/controls/Private/qmldir
@@ -1,5 +1,4 @@
 module QtQuick.Controls.Private
-plugin qtquickcontrolsprivateplugin
 AbstractCheckable 1.0 AbstractCheckable.qml
 Control 1.0 Control.qml
 FocusFrame 1.0 FocusFrame.qml
diff --git a/src/private/qquickabstractstyle.cpp b/src/controls/Private/qquickabstractstyle.cpp
index eba57b03b..eba57b03b 100644
--- a/src/private/qquickabstractstyle.cpp
+++ b/src/controls/Private/qquickabstractstyle.cpp
diff --git a/src/private/qquickabstractstyle_p.h b/src/controls/Private/qquickabstractstyle_p.h
index 137640535..137640535 100644
--- a/src/private/qquickabstractstyle_p.h
+++ b/src/controls/Private/qquickabstractstyle_p.h
diff --git a/src/private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index e2daa17fa..e2daa17fa 100644
--- a/src/private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
diff --git a/src/private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h
index 8ff0ecbf5..8ff0ecbf5 100644
--- a/src/private/qquickcontrolsettings_p.h
+++ b/src/controls/Private/qquickcontrolsettings_p.h
diff --git a/src/private/qquickcontrolsprivate_p.h b/src/controls/Private/qquickcontrolsprivate_p.h
index 068b2a217..068b2a217 100644
--- a/src/private/qquickcontrolsprivate_p.h
+++ b/src/controls/Private/qquickcontrolsprivate_p.h
diff --git a/src/private/qquickpadding_p.h b/src/controls/Private/qquickpadding_p.h
index 1830df4c6..1830df4c6 100644
--- a/src/private/qquickpadding_p.h
+++ b/src/controls/Private/qquickpadding_p.h
diff --git a/src/private/qquickrangemodel.cpp b/src/controls/Private/qquickrangemodel.cpp
index ee1ade32c..ee1ade32c 100644
--- a/src/private/qquickrangemodel.cpp
+++ b/src/controls/Private/qquickrangemodel.cpp
diff --git a/src/private/qquickrangemodel_p.h b/src/controls/Private/qquickrangemodel_p.h
index a15843d70..a15843d70 100644
--- a/src/private/qquickrangemodel_p.h
+++ b/src/controls/Private/qquickrangemodel_p.h
diff --git a/src/private/qquickrangemodel_p_p.h b/src/controls/Private/qquickrangemodel_p_p.h
index 9ddf16c2b..9ddf16c2b 100644
--- a/src/private/qquickrangemodel_p_p.h
+++ b/src/controls/Private/qquickrangemodel_p_p.h
diff --git a/src/private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp
index a39a8deb5..a39a8deb5 100644
--- a/src/private/qquickspinboxvalidator.cpp
+++ b/src/controls/Private/qquickspinboxvalidator.cpp
diff --git a/src/private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h
index 09468fcea..09468fcea 100644
--- a/src/private/qquickspinboxvalidator_p.h
+++ b/src/controls/Private/qquickspinboxvalidator_p.h
diff --git a/src/private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index e1c9ee184..e1c9ee184 100644
--- a/src/private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
diff --git a/src/private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h
index cfe9866eb..cfe9866eb 100644
--- a/src/private/qquickstyleitem_p.h
+++ b/src/controls/Private/qquickstyleitem_p.h
diff --git a/src/private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp
index ae4366d9c..ae4366d9c 100644
--- a/src/private/qquicktooltip.cpp
+++ b/src/controls/Private/qquicktooltip.cpp
diff --git a/src/private/qquicktooltip_p.h b/src/controls/Private/qquicktooltip_p.h
index 20f91830f..20f91830f 100644
--- a/src/private/qquicktooltip_p.h
+++ b/src/controls/Private/qquicktooltip_p.h
diff --git a/src/private/qquickwheelarea.cpp b/src/controls/Private/qquickwheelarea.cpp
index 101e22bf0..101e22bf0 100644
--- a/src/private/qquickwheelarea.cpp
+++ b/src/controls/Private/qquickwheelarea.cpp
diff --git a/src/private/qquickwheelarea_p.h b/src/controls/Private/qquickwheelarea_p.h
index 057ad56de..057ad56de 100644
--- a/src/private/qquickwheelarea_p.h
+++ b/src/controls/Private/qquickwheelarea_p.h
diff --git a/src/private/style.js b/src/controls/Private/style.js
index 2c47ff0e7..2c47ff0e7 100644
--- a/src/private/style.js
+++ b/src/controls/Private/style.js
diff --git a/src/styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index aea5f721e..aea5f721e 100644
--- a/src/styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
diff --git a/src/styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index 0f38668fa..0f38668fa 100644
--- a/src/styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
diff --git a/src/styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 7984a329f..7984a329f 100644
--- a/src/styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
diff --git a/src/styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml
index 6fd50e9af..6fd50e9af 100644
--- a/src/styles/Base/FocusFrameStyle.qml
+++ b/src/controls/Styles/Base/FocusFrameStyle.qml
diff --git a/src/styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml
index 1c3acadab..1c3acadab 100644
--- a/src/styles/Base/GroupBoxStyle.qml
+++ b/src/controls/Styles/Base/GroupBoxStyle.qml
diff --git a/src/styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 895a6ef0b..895a6ef0b 100644
--- a/src/styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
diff --git a/src/styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml
index 4b2099f8e..4b2099f8e 100644
--- a/src/styles/Base/MenuStyle.qml
+++ b/src/controls/Styles/Base/MenuStyle.qml
diff --git a/src/styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index ada97c101..ada97c101 100644
--- a/src/styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
diff --git a/src/styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index ef3f22299..ef3f22299 100644
--- a/src/styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
diff --git a/src/styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index ed7dd171f..ed7dd171f 100644
--- a/src/styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
diff --git a/src/styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index cd3619109..cd3619109 100644
--- a/src/styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
diff --git a/src/styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index 931db588b..931db588b 100644
--- a/src/styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
diff --git a/src/styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml
index f8ffffd90..f8ffffd90 100644
--- a/src/styles/Base/StatusBarStyle.qml
+++ b/src/controls/Styles/Base/StatusBarStyle.qml
diff --git a/src/styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml
index d73d9bcb8..d73d9bcb8 100644
--- a/src/styles/Base/TabViewStyle.qml
+++ b/src/controls/Styles/Base/TabViewStyle.qml
diff --git a/src/styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index 4484f1c93..4484f1c93 100644
--- a/src/styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
diff --git a/src/styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
index 16d0fe94c..16d0fe94c 100644
--- a/src/styles/Base/TextFieldStyle.qml
+++ b/src/controls/Styles/Base/TextFieldStyle.qml
diff --git a/src/styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml
index a5c03e7a1..a5c03e7a1 100644
--- a/src/styles/Base/ToolBarStyle.qml
+++ b/src/controls/Styles/Base/ToolBarStyle.qml
diff --git a/src/styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml
index 280740e4d..280740e4d 100644
--- a/src/styles/Base/ToolButtonStyle.qml
+++ b/src/controls/Styles/Base/ToolButtonStyle.qml
diff --git a/src/styles/Base/images/arrow-down.png b/src/controls/Styles/Base/images/arrow-down.png
index c20f6256b..c20f6256b 100644
--- a/src/styles/Base/images/arrow-down.png
+++ b/src/controls/Styles/Base/images/arrow-down.png
diff --git a/src/styles/Base/images/arrow-down@2x.png b/src/controls/Styles/Base/images/arrow-down@2x.png
index f79b87c85..f79b87c85 100644
--- a/src/styles/Base/images/arrow-down@2x.png
+++ b/src/controls/Styles/Base/images/arrow-down@2x.png
diff --git a/src/styles/Base/images/arrow-left.png b/src/controls/Styles/Base/images/arrow-left.png
index 02153519b..02153519b 100644
--- a/src/styles/Base/images/arrow-left.png
+++ b/src/controls/Styles/Base/images/arrow-left.png
diff --git a/src/styles/Base/images/arrow-left@2x.png b/src/controls/Styles/Base/images/arrow-left@2x.png
index 0005b3e70..0005b3e70 100644
--- a/src/styles/Base/images/arrow-left@2x.png
+++ b/src/controls/Styles/Base/images/arrow-left@2x.png
diff --git a/src/styles/Base/images/arrow-right.png b/src/controls/Styles/Base/images/arrow-right.png
index 8753b9de7..8753b9de7 100644
--- a/src/styles/Base/images/arrow-right.png
+++ b/src/controls/Styles/Base/images/arrow-right.png
diff --git a/src/styles/Base/images/arrow-right@2x.png b/src/controls/Styles/Base/images/arrow-right@2x.png
index 21b36f7bb..21b36f7bb 100644
--- a/src/styles/Base/images/arrow-right@2x.png
+++ b/src/controls/Styles/Base/images/arrow-right@2x.png
diff --git a/src/styles/Base/images/arrow-up.png b/src/controls/Styles/Base/images/arrow-up.png
index ec5d1b213..ec5d1b213 100644
--- a/src/styles/Base/images/arrow-up.png
+++ b/src/controls/Styles/Base/images/arrow-up.png
diff --git a/src/styles/Base/images/arrow-up@2x.png b/src/controls/Styles/Base/images/arrow-up@2x.png
index f064ab600..f064ab600 100644
--- a/src/styles/Base/images/arrow-up@2x.png
+++ b/src/controls/Styles/Base/images/arrow-up@2x.png
diff --git a/src/styles/Base/images/button.png b/src/controls/Styles/Base/images/button.png
index b2722f820..b2722f820 100644
--- a/src/styles/Base/images/button.png
+++ b/src/controls/Styles/Base/images/button.png
diff --git a/src/styles/Base/images/button_down.png b/src/controls/Styles/Base/images/button_down.png
index 088ed20d5..088ed20d5 100644
--- a/src/styles/Base/images/button_down.png
+++ b/src/controls/Styles/Base/images/button_down.png
diff --git a/src/styles/Base/images/editbox.png b/src/controls/Styles/Base/images/editbox.png
index 1f25e70d9..1f25e70d9 100644
--- a/src/styles/Base/images/editbox.png
+++ b/src/controls/Styles/Base/images/editbox.png
diff --git a/src/styles/Base/images/focusframe.png b/src/controls/Styles/Base/images/focusframe.png
index 07d208299..07d208299 100644
--- a/src/styles/Base/images/focusframe.png
+++ b/src/controls/Styles/Base/images/focusframe.png
diff --git a/src/styles/Base/images/groupbox.png b/src/controls/Styles/Base/images/groupbox.png
index 98585ee8c..98585ee8c 100644
--- a/src/styles/Base/images/groupbox.png
+++ b/src/controls/Styles/Base/images/groupbox.png
diff --git a/src/styles/Base/images/header.png b/src/controls/Styles/Base/images/header.png
index 2ef7d1c4d..2ef7d1c4d 100644
--- a/src/styles/Base/images/header.png
+++ b/src/controls/Styles/Base/images/header.png
diff --git a/src/styles/Base/images/progress-indeterminate.png b/src/controls/Styles/Base/images/progress-indeterminate.png
index 19ee7ad3c..19ee7ad3c 100644
--- a/src/styles/Base/images/progress-indeterminate.png
+++ b/src/controls/Styles/Base/images/progress-indeterminate.png
diff --git a/src/styles/Base/images/scrollbar-handle-horizontal.png b/src/controls/Styles/Base/images/scrollbar-handle-horizontal.png
index 069ca10d9..069ca10d9 100644
--- a/src/styles/Base/images/scrollbar-handle-horizontal.png
+++ b/src/controls/Styles/Base/images/scrollbar-handle-horizontal.png
diff --git a/src/styles/Base/images/scrollbar-handle-vertical.png b/src/controls/Styles/Base/images/scrollbar-handle-vertical.png
index 921a2fe39..921a2fe39 100644
--- a/src/styles/Base/images/scrollbar-handle-vertical.png
+++ b/src/controls/Styles/Base/images/scrollbar-handle-vertical.png
diff --git a/src/styles/Base/images/tab.png b/src/controls/Styles/Base/images/tab.png
index ae686c4ce..ae686c4ce 100644
--- a/src/styles/Base/images/tab.png
+++ b/src/controls/Styles/Base/images/tab.png
diff --git a/src/styles/Base/images/tab_selected.png b/src/controls/Styles/Base/images/tab_selected.png
index 369de2e49..369de2e49 100644
--- a/src/styles/Base/images/tab_selected.png
+++ b/src/controls/Styles/Base/images/tab_selected.png
diff --git a/src/styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml
index 2385873e8..2385873e8 100644
--- a/src/styles/Desktop/ButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ButtonStyle.qml
diff --git a/src/styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml
index 6bbb5b1d5..6bbb5b1d5 100644
--- a/src/styles/Desktop/CheckBoxStyle.qml
+++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml
diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml
index 953976413..953976413 100644
--- a/src/styles/Desktop/ComboBoxStyle.qml
+++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml
diff --git a/src/styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml
index 420a0ab5b..420a0ab5b 100644
--- a/src/styles/Desktop/FocusFrameStyle.qml
+++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml
diff --git a/src/styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml
index 835dd7186..835dd7186 100644
--- a/src/styles/Desktop/GroupBoxStyle.qml
+++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml
diff --git a/src/styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml
index 291df0fbd..291df0fbd 100644
--- a/src/styles/Desktop/MenuBarStyle.qml
+++ b/src/controls/Styles/Desktop/MenuBarStyle.qml
diff --git a/src/styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml
index 960a163d2..960a163d2 100644
--- a/src/styles/Desktop/MenuStyle.qml
+++ b/src/controls/Styles/Desktop/MenuStyle.qml
diff --git a/src/styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml
index 834b8ab3c..834b8ab3c 100644
--- a/src/styles/Desktop/ProgressBarStyle.qml
+++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml
diff --git a/src/styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml
index b41b959a2..b41b959a2 100644
--- a/src/styles/Desktop/RadioButtonStyle.qml
+++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml
diff --git a/src/styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml
index ff03b3c3b..ff03b3c3b 100644
--- a/src/styles/Desktop/ScrollViewStyle.qml
+++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml
diff --git a/src/styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml
index e435205ec..e435205ec 100644
--- a/src/styles/Desktop/SliderStyle.qml
+++ b/src/controls/Styles/Desktop/SliderStyle.qml
diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml
index 24f51427c..24f51427c 100644
--- a/src/styles/Desktop/SpinBoxStyle.qml
+++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml
diff --git a/src/styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml
index 930ca773c..930ca773c 100644
--- a/src/styles/Desktop/StatusBarStyle.qml
+++ b/src/controls/Styles/Desktop/StatusBarStyle.qml
diff --git a/src/styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml
index 51b70ea4d..51b70ea4d 100644
--- a/src/styles/Desktop/TabViewStyle.qml
+++ b/src/controls/Styles/Desktop/TabViewStyle.qml
diff --git a/src/styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index 171678a3f..171678a3f 100644
--- a/src/styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml
index 53282887a..53282887a 100644
--- a/src/styles/Desktop/TextFieldStyle.qml
+++ b/src/controls/Styles/Desktop/TextFieldStyle.qml
diff --git a/src/styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml
index c295f7310..c295f7310 100644
--- a/src/styles/Desktop/ToolBarStyle.qml
+++ b/src/controls/Styles/Desktop/ToolBarStyle.qml
diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml
index 25529f11d..25529f11d 100644
--- a/src/styles/Desktop/ToolButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml
diff --git a/src/styles/qmldir b/src/controls/Styles/qmldir
index 5077542a5..5077542a5 100644
--- a/src/styles/qmldir
+++ b/src/controls/Styles/qmldir
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri
new file mode 100644
index 000000000..10eb3e9b4
--- /dev/null
+++ b/src/controls/Styles/styles.pri
@@ -0,0 +1,69 @@
+
+# Base
+STYLES_QML_FILES = \
+    $$PWD/Base/ButtonStyle.qml \
+    $$PWD/Base/CheckBoxStyle.qml \
+    $$PWD/Base/ComboBoxStyle.qml \
+    $$PWD/Base/FocusFrameStyle.qml \
+    $$PWD/Base/GroupBoxStyle.qml \
+    $$PWD/Base/MenuBarStyle.qml \
+    $$PWD/Base/MenuStyle.qml \
+    $$PWD/Base/ProgressBarStyle.qml \
+    $$PWD/Base/RadioButtonStyle.qml \
+    $$PWD/Base/ScrollViewStyle.qml\
+    $$PWD/Base/SliderStyle.qml \
+    $$PWD/Base/SpinBoxStyle.qml \
+    $$PWD/Base/StatusBarStyle.qml \
+    $$PWD/Base/TableViewStyle.qml \
+    $$PWD/Base/TabViewStyle.qml \
+    $$PWD/Base/TextFieldStyle.qml \
+    $$PWD/Base/ToolBarStyle.qml \
+    $$PWD/Base/ToolButtonStyle.qml
+
+# Desktop
+STYLES_QML_FILES += \
+    $$PWD/Desktop/ButtonStyle.qml \
+    $$PWD/Desktop/CheckBoxStyle.qml \
+    $$PWD/Desktop/ComboBoxStyle.qml \
+    $$PWD/Desktop/FocusFrameStyle.qml \
+    $$PWD/Desktop/GroupBoxStyle.qml \
+    $$PWD/Desktop/MenuBarStyle.qml \
+    $$PWD/Desktop/MenuStyle.qml \
+    $$PWD/Desktop/ProgressBarStyle.qml \
+    $$PWD/Desktop/RadioButtonStyle.qml \
+    $$PWD/Desktop/ScrollViewStyle.qml \
+    $$PWD/Desktop/SliderStyle.qml \
+    $$PWD/Desktop/SpinBoxStyle.qml \
+    $$PWD/Desktop/StatusBarStyle.qml\
+    $$PWD/Desktop/TabViewStyle.qml \
+    $$PWD/Desktop/TableViewStyle.qml \
+    $$PWD/Desktop/TextFieldStyle.qml \
+    $$PWD/Desktop/ToolBarStyle.qml \
+    $$PWD/Desktop/ToolButtonStyle.qml
+
+# Images
+STYLES_QML_FILES += \
+    $$PWD/Base/images/button.png \
+    $$PWD/Base/images/button_down.png \
+    $$PWD/Base/images/tab.png \
+    $$PWD/Base/images/header.png \
+    $$PWD/Base/images/groupbox.png \
+    $$PWD/Base/images/focusframe.png \
+    $$PWD/Base/images/tab_selected.png \
+    $$PWD/Base/images/scrollbar-handle-horizontal.png \
+    $$PWD/Base/images/scrollbar-handle-vertical.png \
+    $$PWD/Base/images/progress-indeterminate.png \
+    $$PWD/Base/images/editbox.png \
+    $$PWD/Base/images/arrow-up.png \
+    $$PWD/Base/images/arrow-up@2x.png \
+    $$PWD/Base/images/arrow-down.png \
+    $$PWD/Base/images/arrow-down@2x.png \
+    $$PWD/Base/images/arrow-left.png \
+    $$PWD/Base/images/arrow-left@2x.png \
+    $$PWD/Base/images/arrow-right.png \
+    $$PWD/Base/images/arrow-right@2x.png
+
+STYLES_QML_FILES += $$PWD/qmldir
+
+QML_FILES += $$STYLES_QML_FILES
+
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index ba97663f2..0a9d42c00 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -5,7 +5,7 @@ QT += qml quick gui-private core-private
 
 QMAKE_DOCS = $$PWD/doc/qtquickcontrols.qdocconf
 
-QML_FILES = \
+CONTROLS_QML_FILES = \
     ApplicationWindow.qml \
     Button.qml \
     CheckBox.qml \
@@ -33,9 +33,16 @@ QML_FILES = \
     ToolBar.qml \
     ToolButton.qml
 
+QML_FILES += $$CONTROLS_QML_FILES
+
 SOURCES += $$PWD/plugin.cpp
+HEADERS += $$PWD/plugin.h
 
 include(plugin.pri)
+include(Private/private.pri)
+include(Styles/styles.pri)
+
+osx: LIBS += -framework Carbon
 
 CONFIG += no_cxx_module
 load(qml_plugin)
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index fe7770aa3..3a5662484 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -18,30 +18,41 @@ qhp.QtQuickControls.filterAttributes    = qtquickcontrols $QT_VERSION qtrefdoc
 qhp.QtQuickControls.customFilters.Qt.name = QtQuickControls $QT_VERSION
 qhp.QtQuickControls.customFilters.Qt.filterAttributes = qtquickcontrols $QT_VERSION
 
-qhp.QtQuickControls.subprojects = qtquickcontrolsqmltypes
-qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.title = QML Types
+qhp.QtQuickControls.subprojects = qtquickcontrolsqmltypes qtquickcontrolsstyles
+
+qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.title      = Controls QML Types
 qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.indexTitle = Qt Quick Controls QML Types
-qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.selectors = class fake:qmlclass
-qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.sortPages = true
+qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.selectors  = fake:qmlclass # cannot choose qmltypes from a specific group QTBUG-32985
+qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.sortPages  = true
+
+qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.title      = Qt Quick Controls Styles Structure
+qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.indexTitle = Qt Quick Controls Styles Structure
+qhp.QtQuickControls.subprojects.qtquickcontrolsstyles.type       = manual
 
-depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts qtquickcontrolsstyles
+depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts
 
 exampledirs += ../../../examples/quick
 
 # Specify the install path under QT_INSTALL_EXAMPLES
 examplesinstallpath = quick/controls
 
-headerdirs += ../
-
-sourcedirs += ../
-
-sources += ../../private/AbstractCheckable.qml \
-           ../../private/BasicButton.qml \
-           ../../private/FocusFrame.qml \
-           ../../private/ModalPopupBehavior.qml \
-           ../../private/ScrollBar.qml \
-           ../../private/TabBar.qml \
-           ../../private/Control.qml \
+headerdirs += ../ \
+              Styles/Base
+
+sourcedirs += ../ \
+              Styles/Base
+
+sources += ../Private/AbstractCheckable.qml \
+           ../Private/BasicButton.qml \
+           ../Private/FocusFrame.qml \
+           ../Private/ModalPopupBehavior.qml \
+           ../Private/ScrollBar.qml \
+           ../Private/TabBar.qml \
+           ../Private/Control.qml \
+           ../Private/qquickstyleitem.cpp \
+           ../Private/Style.qml \
+           ../Private/qquickabstractstyle.h \
+           ../Private/qquickabstractstyle.cpp
 
 imagedirs += images
 
diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc
index 731380866..746d7873f 100644
--- a/src/controls/doc/src/qtquickcontrols.qdoc
+++ b/src/controls/doc/src/qtquickcontrols.qdoc
@@ -35,6 +35,8 @@
     interfaces. These QML types work in conjunction with \l{Qt Quick} and
     \l{Qt Quick Layouts}.
 
+    Controls can be styled using the \l{Qt Quick Controls Styles QML Types}{Styles QML Types}.
+
     The QML types can be imported into your application using the
     following import statement in your .qml file.
 
diff --git a/src/styles/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
index ed4a00825..e035ddba9 100644
--- a/src/styles/doc/src/qtquickcontrolsstyles-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
@@ -84,6 +84,17 @@
 */
 
 /*!
+    \page qtquickcontrolsstyles-structure.html
+    \title Qt Quick Controls Styles Structure
+     \list
+      \li \l{Qt Quick Controls Styles}
+          \list
+          \li \l{Qt Quick Controls Styles QML Types}{Styles QMl Types}
+          \endlist
+     \endlist
+*/
+
+/*!
     \qmlmodule QtQuick.Controls.Styles 1
     \title Qt Quick Controls Styles QML Types
     \ingroup qmlmodules
@@ -96,4 +107,7 @@
     A styling object is usually a collection of properties that control behavior and simple delegates
     that can be replaced with custom QML snippets.
 
+    \code
+    import QtQuick.Controls.Styles 1.0
+    \endcode
 */
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 6b67c1b21..1e8422379 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include "plugin.h"
+
 #include "qquickaction_p.h"
 #include "qquickexclusivegroup_p.h"
 #include "qquickmenu_p.h"
@@ -46,22 +48,19 @@
 #include "qquickstack_p.h"
 #include "qquickdesktopiconprovider_p.h"
 
-#include <qqml.h>
-#include <qqmlengine.h>
-#include <qqmlextensionplugin.h>
-#include <qquickwindow.h>
-
-QT_BEGIN_NAMESPACE
+#include "Private/qquickrangemodel_p.h"
+#include "Private/qquickwheelarea_p.h"
+#include "Private/qquicktooltip_p.h"
+#include "Private/qquickcontrolsettings_p.h"
+#include "Private/qquickspinboxvalidator_p.h"
+#include "Private/qquickabstractstyle_p.h"
+#include "Private/qquickcontrolsprivate_p.h"
 
-class QtQuickControlsPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+#ifndef QT_NO_WIDGETS
+#include "Private/qquickstyleitem_p.h"
+#endif
 
-public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-};
+QT_BEGIN_NAMESPACE
 
 void QtQuickControlsPlugin::registerTypes(const char *uri)
 {
@@ -82,9 +81,21 @@ void QtQuickControlsPlugin::registerTypes(const char *uri)
 void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(uri);
+
+    // Register private API
+    const char *private_uri = "QtQuick.Controls.Private";
+    qmlRegisterType<QQuickAbstractStyle>(private_uri, 1, 0, "AbstractStyle");
+    qmlRegisterType<QQuickPadding>();
+    qmlRegisterType<QQuickRangeModel>(private_uri, 1, 0, "RangeModel");
+    qmlRegisterType<QQuickWheelArea>(private_uri, 1, 0, "WheelArea");
+    qmlRegisterType<QQuickSpinBoxValidator>(private_uri, 1, 0, "SpinBoxValidator");
+    qmlRegisterSingletonType<QQuickTooltip>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule);
+    qmlRegisterSingletonType<QQuickControlSettings>(private_uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule);
+#ifndef QT_NO_WIDGETS
+    qmlRegisterType<QQuickStyleItem>(private_uri, 1, 0, "StyleItem");
+#endif
+
     engine->addImageProvider("desktoptheme", new QQuickDesktopIconProvider);
 }
 
 QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/src/controls/plugin.h b/src/controls/plugin.h
new file mode 100644
index 000000000..fe06e8069
--- /dev/null
+++ b/src/controls/plugin.h
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlengine.h>
+
+QT_BEGIN_NAMESPACE
+
+class QtQuickControlsPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+
+QT_END_NAMESPACE
+
+#endif // PLUGIN_H
diff --git a/src/private/plugin.cpp b/src/private/plugin.cpp
deleted file mode 100644
index 4a62c6a5b..000000000
--- a/src/private/plugin.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickrangemodel_p.h"
-#include "qquickwheelarea_p.h"
-#include "qquicktooltip_p.h"
-#include "qquickcontrolsettings_p.h"
-#include "qquickspinboxvalidator_p.h"
-#include "qquickabstractstyle_p.h"
-#include "qquickcontrolsprivate_p.h"
-
-#ifndef QT_NO_WIDGETS
-#include "qquickstyleitem_p.h"
-#endif
-
-#include <qqml.h>
-#include <qqmlextensionplugin.h>
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickControlsPrivatePlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-void QtQuickControlsPrivatePlugin::registerTypes(const char *uri)
-{
-    qmlRegisterType<QQuickAbstractStyle>(uri, 1, 0, "AbstractStyle");
-    qmlRegisterType<QQuickPadding>();
-    qmlRegisterType<QQuickRangeModel>(uri, 1, 0, "RangeModel");
-    qmlRegisterType<QQuickWheelArea>(uri, 1, 0, "WheelArea");
-    qmlRegisterType<QQuickSpinBoxValidator>(uri, 1, 0, "SpinBoxValidator");
-    qmlRegisterSingletonType<QQuickTooltip>(uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule);
-    qmlRegisterSingletonType<QQuickControlSettings>(uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule);
-#ifndef QT_NO_WIDGETS
-    qmlRegisterType<QQuickStyleItem>(uri, 1, 0, "StyleItem");
-#endif
-}
-
-QT_END_NAMESPACE
-
-#include "plugin.moc"
diff --git a/src/private/private.pro b/src/private/private.pro
deleted file mode 100644
index 1c71d1d4b..000000000
--- a/src/private/private.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-TARGET  = qtquickcontrolsprivateplugin
-TARGETPATH = QtQuick/Controls/Private
-
-QT += qml quick gui-private core-private
-
-include(private.pri)
-
-SOURCES += $$PWD/plugin.cpp
-
-# private qml files
-QML_FILES += \
-    AbstractCheckable.qml \
-    TabBar.qml \
-    BasicButton.qml \
-    Control.qml \
-    Style.qml \
-    style.js \
-    ModalPopupBehavior.qml \
-    StackViewSlideDelegate.qml \
-    StackView.js \
-    ScrollViewHelper.qml \
-    ScrollBar.qml \
-    FocusFrame.qml
-
-osx: LIBS += -framework Carbon
-
-CONFIG += no_cxx_module
-load(qml_plugin)
diff --git a/src/src.pro b/src/src.pro
index 2108ac7e6..a440948af 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += controls styles private
+SUBDIRS += controls
 
 SUBDIRS += layouts
diff --git a/src/styles/doc/qtquickcontrolsstyles.qdocconf b/src/styles/doc/qtquickcontrolsstyles.qdocconf
deleted file mode 100644
index 6c1e51b1b..000000000
--- a/src/styles/doc/qtquickcontrolsstyles.qdocconf
+++ /dev/null
@@ -1,43 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-project                 = QtQuickControlsStyles
-description             = Qt Quick Controls Styles Reference Documentation
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtquickcontrolsstyles/
-version                 = $QT_VERSION
-
-qhp.projects            = QtQuickControlsStyles
-
-qhp.QtQuickControlsStyles.file          = qtquickcontrolsstyles.qhp
-qhp.QtQuickControlsStyles.namespace     = org.qt-project.qtquickcontrolsstyles.$QT_VERSION_TAG
-qhp.QtQuickControlsStyles.virtualFolder = qtquickcontrolsstyles
-qhp.QtQuickControlsStyles.indexTitle    = Qt Quick Controls Styles
-qhp.QtQuickControlsStyles.indexRoot     =
-#qhp.QtQuickControlsStyles.extraFiles = style/qtquickcontrolsstyles.css
-
-qhp.QtQuickControlsStyles.filterAttributes    = qtquickcontrolsstyles $QT_VERSION qtrefdoc
-qhp.QtQuickControlsStyles.customFilters.Qt.name = QtQuickControlsStyles $QT_VERSION
-qhp.QtQuickControlsStyles.customFilters.Qt.filterAttributes = qtquickcontrolsstyles $QT_VERSION
-
-qhp.QtQuickControlsStyles.subprojects = qtquickcontrolsstylesqmltypes
-qhp.QtQuickControlsStyles.subprojects.qtquickcontrolsstylesqmltypes.title = QML Types
-qhp.QtQuickControlsStyles.subprojects.qtquickcontrolsstylesqmltypes.indexTitle = Qt Quick Controls Styles QML Types
-qhp.QtQuickControlsStyles.subprojects.qtquickcontrolsstylesqmltypes.selectors = class fake:qmlclass
-qhp.QtQuickControlsStyles.subprojects.qtquickcontrolsstylesqmltypes.sortPages = true
-
-depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts qtquickcontrols
-
-exampledirs += ../../../examples/quick/controlsstyles
-
-# Specify the install path under QT_INSTALL_EXAMPLES
-examplesinstallpath = quick/controlsstyles
-
-headerdirs += ../Base
-
-sourcedirs += ../Base
-
-sources += ../../private/qquickstyleitem.cpp \
-           ../../private/Style.qml \
-           ../../private/qquickabstractstyle.h \
-           ../../private/qquickabstractstyle.cpp
-
-imagedirs += images
diff --git a/src/styles/styles.pro b/src/styles/styles.pro
deleted file mode 100644
index 158c1dd13..000000000
--- a/src/styles/styles.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-TARGETPATH = QtQuick/Controls/Styles
-
-QMAKE_DOCS = $$PWD/doc/qtquickcontrolsstyles.qdocconf
-
-# Base
-QML_FILES = \
-    Base/ButtonStyle.qml \
-    Base/CheckBoxStyle.qml \
-    Base/ComboBoxStyle.qml \
-    Base/FocusFrameStyle.qml \
-    Base/GroupBoxStyle.qml \
-    Base/MenuBarStyle.qml \
-    Base/MenuStyle.qml \
-    Base/ProgressBarStyle.qml \
-    Base/RadioButtonStyle.qml \
-    Base/ScrollViewStyle.qml\
-    Base/SliderStyle.qml \
-    Base/SpinBoxStyle.qml \
-    Base/StatusBarStyle.qml \
-    Base/TableViewStyle.qml \
-    Base/TabViewStyle.qml \
-    Base/TextFieldStyle.qml \
-    Base/ToolBarStyle.qml \
-    Base/ToolButtonStyle.qml
-
-# Desktop
-QML_FILES += \
-    Desktop/ButtonStyle.qml \
-    Desktop/CheckBoxStyle.qml \
-    Desktop/ComboBoxStyle.qml \
-    Desktop/FocusFrameStyle.qml \
-    Desktop/GroupBoxStyle.qml \
-    Desktop/MenuBarStyle.qml \
-    Desktop/MenuStyle.qml \
-    Desktop/ProgressBarStyle.qml \
-    Desktop/RadioButtonStyle.qml \
-    Desktop/ScrollViewStyle.qml \
-    Desktop/SliderStyle.qml \
-    Desktop/SpinBoxStyle.qml \
-    Desktop/StatusBarStyle.qml\
-    Desktop/TabViewStyle.qml \
-    Desktop/TableViewStyle.qml \
-    Desktop/TextFieldStyle.qml \
-    Desktop/ToolBarStyle.qml \
-    Desktop/ToolButtonStyle.qml
-
-# Images
-QML_FILES += \
-    Base/images/button.png \
-    Base/images/button_down.png \
-    Base/images/tab.png \
-    Base/images/header.png \
-    Base/images/groupbox.png \
-    Base/images/focusframe.png \
-    Base/images/tab_selected.png \
-    Base/images/scrollbar-handle-horizontal.png \
-    Base/images/scrollbar-handle-vertical.png \
-    Base/images/progress-indeterminate.png \
-    Base/images/editbox.png \
-    Base/images/arrow-up.png \
-    Base/images/arrow-up@2x.png \
-    Base/images/arrow-down.png \
-    Base/images/arrow-down@2x.png \
-    Base/images/arrow-left.png \
-    Base/images/arrow-left@2x.png \
-    Base/images/arrow-right.png \
-    Base/images/arrow-right@2x.png
-
-load(qml_module)