Doc: Add doc structure for Styles

And:
- Add an index page for the Styles
- Add missing documentation for some properties (Component)
- Fix unexpected curly brackets in a couple of code snippets

Change-Id: Ib7265d1cd011a81012eb4b7f69738b84fba5b531
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

3 files changed, 9 insertions, 56 deletions

diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 7cf1ee54..ab321a74 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -18,18 +18,13 @@ qhp.QtQuickControls.filterAttributes    = qtcontrols $QT_VERSION qtrefdoc
 qhp.QtQuickControls.customFilters.Qt.name = QtQuickControls $QT_VERSION
 qhp.QtQuickControls.customFilters.Qt.filterAttributes = qtquickcontrols $QT_VERSION
 
-qhp.QtQuickControls.subprojects = qtquickcontrolsqmltypes styleqmltypes
+qhp.QtQuickControls.subprojects = qtquickcontrolsqmltypes
 qhp.QtQuickControls.subprojects.qtquickcontrolsqmltypes.title = 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.styleqmltypes.title = Styles QML Types
-qhp.QtQuickControls.subprojects.styleqmltypes.indexTitle = Qt Quick Controls Styles QML Types
-qhp.QtQuickControls.subprojects.styleqmltypes.selectors = class fake:qmlclass
-qhp.QtQuickControls.subprojects.styleqmltypes.sortPages = true
-
-depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts
+depends = qtqml qtquick qtwidgets qtdoc qtquicklayouts qtquickcontrolsstyles
 
 exampledirs += ../../../examples/quick/controls
 
@@ -37,21 +32,15 @@ exampledirs += ../../../examples/quick/controls
 examplesinstallpath = quick/controls
 
 headerdirs += ../
-headerdirs += ../ ../../styles/Base
 
 sourcedirs += ../
-sourcedirs += ../ ../../styles/Base
 
-sources += ../../private/qstyleitem.cpp \
-           ../../private/AbstractCheckable.qml \
+sources += ../../private/AbstractCheckable.qml \
            ../../private/BasicButton.qml \
            ../../private/FocusFrame.qml \
            ../../private/ModalPopupBehavior.qml \
            ../../private/ScrollBar.qml \
            ../../private/TabBar.qml \
            ../../private/Control.qml \
-           ../../private/Style.qml \
-           ../../private/qquickabstractstyle.h \
-           ../../private/qquickabstractstyle.cpp
 
 imagedirs += images
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc
index 658d117b..0272755f 100644
--- a/src/controls/doc/src/qtquickcontrols-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-index.qdoc
@@ -84,7 +84,12 @@
 
     \section2 Styles
     \list
-     \li \l {Qt Quick Controls Styles QML Types}
+     \li \l {Qt Quick Controls Styles}
+    \endlist
+
+    \section2 Styles
+    \list
+     \li \l {Qt Quick Layouts}
     \endlist
 
 */
diff --git a/src/controls/doc/src/styles.qdoc b/src/controls/doc/src/styles.qdoc
deleted file mode 100644
index 40809414..00000000
--- a/src/controls/doc/src/styles.qdoc
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \qmlmodule QtQuick.Controls.Styles 1
-    \title Qt Quick Controls Styles QML Types
-    \ingroup qmlmodules
-    \brief Provides QML types for Qt Quick Controls styles.
-
-    The \l{Qt Quick Controls} module provides a set of QML types for handling
-    styles.
-
-    Some of the controls allow custom styling similar to widget style sheets.
-    A styling object is usually a collection of properties that control behavior and simple delegates
-    that can be replaced with custom QML snippets.
-
-*/