doc: Minor changes to qtquickcontrols.qdocconf

Organizing the file a bit to make it match other qdocconf files.

Change-Id: Ide0ff9da3d1b586e7a00828ef546c4435359ba8c
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

src/controls/doc/qtquickcontrols.qdocconf

 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-# Name of the project.
 project                 = QtQuickControls
-description             = Qt Quick Controls Documentation
+description             = Qt Quick Controls Reference Documentation
 url                     = http://qt-project.org/doc/qt-$QT_VER/qtquickcontrols/
 version                 = $QT_VERSION
 
-depends = qtqml qtquick qtwidgets qtdoc
+qhp.projects            = qtquickcontrols
+
+qhp.qtquickcontrols.file          = qtquickcontrols.qhp
+qhp.qtquickcontrols.namespace     = org.qt-project.qtquickcontrols.$QT_VERSION_TAG
+qhp.qtquickcontrols.virtualFolder = qtquickcontrols
+qhp.qtquickcontrols.indexTitle    = Qt Quick Controls
+qhp.qtquickcontrols.indexRoot     =
+#qhp.qtquickcontrols.extraFiles = style/qtquickcontrols.css
+
+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.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
 
-# Directories in which to search for files to document and images.
-# By default set to the root directory of the project for sources
-# and headers and qdoc will therefore generate output for each file.
-# Images should be placed in <rootdir>/dic/images and examples in
-# <rootdir>/examples.
-# Paths are relative to the  location of this file.
+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
 
 exampledirs += ../../../examples/
 
@@ -47,40 +63,3 @@ sources += ../../private/qstyleitem.cpp \
            ../../styles/ToolButtonStyle.qml
 
 imagedirs += images
-
-# The following parameters are for creating a qhp file, the qhelpgenerator
-# program can convert the qhp file into a qch file which can be opened in
-# Qt Assistant and/or Qt Creator.
-
-# Defines the name of the project. You cannot use operators (+, =, -) in
-# the name. Properties for this project are set using a qhp.<projectname>.property
-# format.
-qhp.projects = qtquickcontrols
-
-# Sets the name of the output qhp file.
-qhp.qtquickcontrols.file = qtquickcontrols.qhp
-
-# Namespace for the output file. This namespace is used to distinguish between
-# different documentation files in Creator/Assistant.
-qhp.qtquickcontrols.namespace = org.qt-project.qtquickcontrols.$QT_VERSION_TAG
-
-# Title for the package, will be the main title for the package in
-# Assistant/Creator.
-qhp.qtquickcontrols.indexTitle = Qt Quick Controls
-
-# Extra files to add to the output which are not linked to from anywhere
-# using a qdoc \l command.
-#qhp.qtquickcontrols.extraFiles = style/qtquickcontrols.css
-
-# Only update the name of the project for the next variables.
-qhp.qtquickcontrols.virtualFolder  = qtquickcontrols
-
-qhp.qtquickcontrols.subprojects = qtquickcontrolsqmltypes styleqmltypes
-qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.title = Qt Quick Controls QML Types
-qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.indexTitle = Qt Quick Controls QML Types
-qhp.qtquickcontrols.subprojects.qtquickcontrolsqmltypes.selectors = class fake:headerfile
-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:headerfile
-qhp.qtquickcontrols.subprojects.styleqmltypes.sortPages = true