diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-10-27 00:08:58 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-10-30 12:42:32 +0000 |
| commit | 9412b7cedb48cec339ba39fc56dccf5ed78f3d8e (patch) | |
| tree | a5f3f4c949cc76cd38c0b6bead5d3df123fd761e | |
| parent | 7f0db6d0472037a3ec005f9066f6222d78de60e1 (diff) | |
Doc: Fix linking to Qt Quick Controls
The dependency to Qt Quick Controls 2 is now simply 'qtquickcontrols'.
Remove the dependency to old version 1 of Controls, and update linking
to Controls examples accordindly.
Task-number: QTBUG-70333
Change-Id: I2f42031ab8aea90332b8b68537654ea761e44811
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/examples.qdoc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 34ec66bf1d..1dbf199bc8 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -37,7 +37,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtquick/qtquick.tags -depends += qtcore qtxmlpatterns qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols2 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql +depends += qtcore qtxmlpatterns qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql headerdirs += ..\ ../../quickwidgets diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc index 538c459707..39fc7f27eb 100644 --- a/src/quick/doc/src/examples.qdoc +++ b/src/quick/doc/src/examples.qdoc @@ -127,7 +127,7 @@ Creator. \li \l{Qt Quick Controls - Gallery}{Controls Gallery} \li \l{Qt Quick System Dialog Examples}{Dialog Examples} \li \l{Calendar Example} - \li \l{Qt Quick Controls - Table View Example}{TableView} + \li \l{tableview/gameoflife}{TableView} \li \l{Qt Quick Examples - Text}{Text and Fonts} \li \l{Qt Quick Examples - Toggle Switch}{Custom Toggle Switch} \endlist @@ -159,7 +159,6 @@ Creator. \list \li \l{Qt Quick Examples - Key Interaction}{Key Interaction} \li \l{Qt Quick Examples - MouseArea}{MouseArea} - \li \l{Qt Quick Controls - Touch Gallery}{Touch Gallery} \endlist \enddiv \div {class="doc-column"} |