Move the QML Base style within Styles/Base

Change-Id: I1a247656b957c87ef728fb42b2b212e02b5e5cd9
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

src/controls/doc/qtquickcontrols.qdocconf

@@ -37,10 +37,10 @@ exampledirs += ../../../examples/quick/controls
 examplesinstallpath = quick/controls
 
 headerdirs += ../
-headerdirs += ../ ../../styles
+headerdirs += ../ ../../styles/Base
 
 sourcedirs += ../
-sourcedirs += ../ ../../styles
+sourcedirs += ../ ../../styles/Base
 
 sources += ../../private/qstyleitem.cpp \
            ../../private/AbstractCheckable.qml \
@@ -51,19 +51,6 @@ sources += ../../private/qstyleitem.cpp \
            ../../private/ScrollBar.qml \
            ../../private/TabBar.qml \
            ../../private/Control.qml \
-           ../../styles/Style.qml \
-           ../../styles/ButtonStyle.qml \
-           ../../styles/CheckBoxStyle.qml \
-           ../../styles/ComboBoxStyle.qml \
-           ../../styles/GroupBoxStyle.qml \
-           ../../styles/MenuBarStyle.qml \
-           ../../styles/ProgressBarStyle.qml \
-           ../../styles/RadioButtonStyle.qml \
-           ../../styles/SliderStyle.qml \
-           ../../styles/SpinBoxStyle.qml \
-           ../../styles/TabViewStyle.qml \
-           ../../styles/TextFieldStyle.qml \
-           ../../styles/ToolBarStyle.qml \
-           ../../styles/ToolButtonStyle.qml
+           ../../private/Style.qml
 
 imagedirs += images

src/private/qquickcontrolsettings.cpp

@@ -54,7 +54,7 @@ QString QQuickControlSettings::theme()
 {
     static QString currentTheme;
     if (currentTheme.isEmpty()) {
-        currentTheme = QLatin1String("Styles");
+        currentTheme = QLatin1String("Styles/Base");
 #ifndef QT_NO_WIDGETS
         //Only enable QStyle support when we are using QApplication
         if (QCoreApplication::instance()->inherits("QApplication")) {

src/styles/MenuBarStyle.qml → src/styles/Base/MenuBarStyle.qml

@@ -40,7 +40,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls.Private 1.0
-import "../Private/style.js" as StyleHelpers
+import "../../Private/style.js" as StyleHelpers
 
 /*!
     \qmltype MenuBarStyle

src/styles/MenuStyle.qml → src/styles/Base/MenuStyle.qml

@@ -41,7 +41,7 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Private 1.0
-import "../Private/style.js" as StyleHelpers
+import "../../Private/style.js" as StyleHelpers
 
 Style {
     id: styleRoot