diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2015-07-27 10:23:40 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-07-27 08:43:43 +0000 |
| commit | 81d6b5d262da419f591adf66205e0456f588ba2c (patch) | |
| tree | 7f014bc2469b2cdf4eabf67b53426f1800960549 /src/controls | |
| parent | 45969a0dbb69005f32eb9f99a9669eaee4aa256c (diff) | |
Doc: Fix issues in documentation configuration files
- Use outputsuffixes variable to generate html filenames
that do not clash with Qt Quick Controls/Extras 1.x
- Fix 'examplesinstallpath' for Qt Quick Extras
- Clean up and remove unneeded comments
Change-Id: Ie2dae3af1181f9528630d78aaac8df693262afdf
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/doc/qtquickcontrols2.qdocconf | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/controls/doc/qtquickcontrols2.qdocconf b/src/controls/doc/qtquickcontrols2.qdocconf index 1adb1b39..a6f47a53 100644 --- a/src/controls/doc/qtquickcontrols2.qdocconf +++ b/src/controls/doc/qtquickcontrols2.qdocconf @@ -20,7 +20,7 @@ qhp.QtQuickControls2.subprojects = qtquickcontrols2qmltypes qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.title = Controls 2 QML Types qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.indexTitle = Qt Quick Controls 2 QML Types -qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.selectors = qmlclass # cannot choose qmltypes from a specific group QTBUG-32985 +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.selectors = qmlclass qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.sortPages = true depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs @@ -28,7 +28,9 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs # Specify the install path under QT_INSTALL_EXAMPLES # Examples will be installed under quick/controls - 'controls' subdirectory # is given as part of \example commands -exampledirs += ../../../examples/quick/controls ../../imports/controls ../../../tests/auto/snippets/data +exampledirs += ../../../examples/quick/controls \ + ../../imports/controls \ + ../../../tests/auto/snippets/data examplesinstallpath = quick/controls headerdirs += ../ @@ -40,3 +42,8 @@ navigation.landingpage = "Qt Quick Controls 2" navigation.qmltypespage = "Qt Quick Controls 2 QML Types" tagfile = qtquickcontrols2.tags + +# Specify a QML module suffix, applied to html filenames, to avoid +# clashes with Qt Quick Controls 1 documentation. +outputsuffixes = QML +outputsuffixes.QML = 2 |