diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-29 14:27:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 15:25:39 +0000 |
| commit | 3a07d1b2e102826f13c80361fe5491ec44c173a6 (patch) | |
| tree | c9fa599ca1aadf169708f9663086c0db7f10e57e /src/imports/controls/doc/qtquickcontrols2.qdocconf | |
| parent | 45de496a54202b41c0c2f7b519cebc0788b82df0 (diff) | |
Restructure the docs to separate the experimental labs QML types
Including the experimental Qt Labs Calendar docs to qqc2.qdocconf leads
to Qt Creator's help contents being mixed with QML types from both
modules. Move the Qt Labs Calendar to its own .qdocconf the same way
it's done for Qt Labs Platform, and just link to both from the index
page. This also ensures that the index-search offers "Calendar" from
"Qt Quick Controls (1)" and "Qt Labs Calendar" instead of "Qt Quick
Controls 2".
Change-Id: Iaf5e7df6d3013657c774d65bf76fb7bc2f80aa71
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/doc/qtquickcontrols2.qdocconf')
| -rw-r--r-- | src/imports/controls/doc/qtquickcontrols2.qdocconf | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 73f9bdfc..a01b48e5 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -29,7 +29,7 @@ qhp.QtQuickControls2.subprojects.examples.title = Examples qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples qhp.QtQuickControls2.subprojects.examples.selectors = fake:example -depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets +depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform # Specify the install path under QT_INSTALL_EXAMPLES # Note: paths passed to \example command must contain the parent directory, e.g. @@ -37,20 +37,16 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquic exampledirs += ../../../../examples/quickcontrols2 \ ../ \ ../../../quicktemplates2 \ - ../../calendar \ snippets examplesinstallpath = quickcontrols2 headerdirs += ../../../quicktemplates2 \ - ../../../quickcontrols2 \ - ../../calendar + ../../../quickcontrols2 sourcedirs += ../../../quicktemplates2 \ ../../../quickcontrols2 \ ../../templates/doc/src \ - ../../calendar/doc/src \ - ../../calendar \ src imagedirs += images @@ -84,7 +80,6 @@ macro.endstylemethod = "\\br" macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>" macro.nbsp.HTML = " " -macro.labs = "\\note \\e{Types in Qt.labs modules are not guaranteed to remain compatible in future versions.}" #Add output suffix to the html filenames outputsuffixes = QML |