From c2000883649141c011fb19ec5e8886fa2cfec880 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Wed, 27 Apr 2016 10:14:14 +0200 Subject: Doc: Disambiguate \l targets by providing additional parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the "QML" parameter we narrow down the search to QML types and its members only, avoiding wrong links that lead to sections with the same title. Change-Id: Idc99b4d2214c14a6e3fd761e6c078df4e9374132 Reviewed-by: Mitch Curtis Reviewed-by: Topi Reiniö Reviewed-by: J-P Nurmi --- .../doc/src/qtquickcontrols2-differences.qdoc | 106 ++++++++++----------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'src/imports/controls/doc/src') diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index c0a53d2f..4607f1de 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -186,90 +186,90 @@ \li Qt Quick Controls \li Qt Quick Controls 2 \row - \li \l [QtQuickControls] {Action} - \li No equivalent; see \l [QtQuick] {Shortcut} instead. + \li \l [QML QtQuickControls] {Action} + \li No equivalent; see \l [QML QtQuick] {Shortcut} instead. \row - \li \l [QtQuickControls] {ApplicationWindow} - \li \l [QtQuickControls2] {ApplicationWindow} + \li \l [QML QtQuickControls] {ApplicationWindow} + \li \l [QML QtQuickControls2] {ApplicationWindow} \row - \li \l [QtQuickControls] {BusyIndicator} - \li \l [QtQuickControls2] {BusyIndicator} + \li \l [QML QtQuickControls] {BusyIndicator} + \li \l [QML QtQuickControls2] {BusyIndicator} \row - \li \l [QtQuickControls] {Button} - \li \l [QtQuickControls2] {Button} + \li \l [QML QtQuickControls] {Button} + \li \l [QML QtQuickControls2] {Button} \row - \li \l [QtQuickControls] {Calendar} + \li \l [QML QtQuickControls] {Calendar} \li No equivalent; see \l [QML] {MonthGrid}, \l [QML] {DayOfWeekRow} and \l [QML] {WeekNumberColumn} instead. \row - \li \l [QtQuickControls] {CheckBox} - \li \l [QtQuickControls2] {CheckBox} + \li \l [QML QtQuickControls] {CheckBox} + \li \l [QML QtQuickControls2] {CheckBox} \row - \li \l [QtQuickControls] {ComboBox} - \li \l [QtQuickControls2] {ComboBox} + \li \l [QML QtQuickControls] {ComboBox} + \li \l [QML QtQuickControls2] {ComboBox} \row - \li \l [QtQuickControls] {ExclusiveGroup} - \li \l [QtQuickControls2] {ButtonGroup} + \li \l [QML QtQuickControls] {ExclusiveGroup} + \li \l [QML QtQuickControls2] {ButtonGroup} \row - \li \l [QtQuickControls] {GroupBox} + \li \l [QML QtQuickControls] {GroupBox} - \li \l [QtQuickControls2] {GroupBox}, or \l [QtQuickControls2] {Frame} + \li \l [QtQuickControls2] {GroupBox}, or \l [QML QtQuickControls2] {Frame} if a title is not required. \row - \li \l [QtQuickControls] {Label} - \li \l [QtQuickControls2] {Label} + \li \l [QML QtQuickControls] {Label} + \li \l [QML QtQuickControls2] {Label} \row - \li \l [QtQuickControls] {Menu} - \li \l [QtQuickControls2] {Menu} + \li \l [QML QtQuickControls] {Menu} + \li \l [QML QtQuickControls2] {Menu} \row - \li \l [QtQuickControls] {ProgressBar} - \li \l [QtQuickControls2] {ProgressBar} + \li \l [QML QtQuickControls] {ProgressBar} + \li \l [QML QtQuickControls2] {ProgressBar} \row - \li \l [QtQuickControls] {RadioButton} - \li \l [QtQuickControls2] {RadioButton} + \li \l [QML QtQuickControls] {RadioButton} + \li \l [QML QtQuickControls2] {RadioButton} \row - \li \l [QtQuickControls] {ScrollView} - \li \l [QtQuickControls2] {ScrollBar}, - \l [QtQuickControls2] {ScrollIndicator} + \li \l [QML QtQuickControls] {ScrollView} + \li \l [QML QtQuickControls2] {ScrollBar}, + \l [QML QtQuickControls2] {ScrollIndicator} \row - \li \l [QtQuickControls] {Slider} - \li \l [QtQuickControls2] {Slider} + \li \l [QML QtQuickControls] {Slider} + \li \l [QML QtQuickControls2] {Slider} \row - \li \l [QtQuickControls] {SpinBox} - \li \l [QtQuickControls2] {SpinBox} + \li \l [QML QtQuickControls] {SpinBox} + \li \l [QML QtQuickControls2] {SpinBox} \row - \li \l [QtQuickControls] {Stack}, - \l [QtQuickControls] {StackView}, - \l [QtQuickControls] {StackViewDelegate} - \li \l [QtQuickControls2] {StackView} + \li \l [QML QtQuickControls] {Stack}, + \l [QML QtQuickControls] {StackView}, + \l [QML QtQuickControls] {StackViewDelegate} + \li \l [QML QtQuickControls2] {StackView} \row - \li \l [QtQuickControls] {StatusBar} + \li \l [QML QtQuickControls] {StatusBar} \li No equivalent \row - \li \l [QtQuickControls] {Switch} - \li \l [QtQuickControls2] {Switch} + \li \l [QML QtQuickControls] {Switch} + \li \l [QML QtQuickControls2] {Switch} \row - \li \l [QtQuickControls] {Tab}, - \l [QtQuickControls] {TabView} - \li \l [QtQuickControls2] {TabBar} in combination with, for example, - \l [QtQuickControls2] {SwipeView}. + \li \l [QML QtQuickControls] {Tab}, + \l [QML QtQuickControls] {TabView} + \li \l [QML QtQuickControls2] {TabBar} in combination with, for example, + \l [QML QtQuickControls2] {SwipeView}. \row - \li \l [QtQuickControls] {TableView} + \li \l [QML QtQuickControls] {TableView} \li No equivalent \row - \li \l [QtQuickControls] {TextArea} - \li \l [QtQuickControls2] {TextArea} + \li \l [QML QtQuickControls] {TextArea} + \li \l [QML QtQuickControls2] {TextArea} \row - \li \l [QtQuickControls] {TextField} - \li \l [QtQuickControls2] {TextField} + \li \l [QML QtQuickControls] {TextField} + \li \l [QML QtQuickControls2] {TextField} \row - \li \l [QtQuickControls] {ToolBar} - \li \l [QtQuickControls2] {ToolBar} + \li \l [QML QtQuickControls] {ToolBar} + \li \l [QML QtQuickControls2] {ToolBar} \row - \li \l [QtQuickControls] {ToolButton} - \li \l [QtQuickControls2] {ToolButton} + \li \l [QML QtQuickControls] {ToolButton} + \li \l [QML QtQuickControls2] {ToolButton} \row - \li \l [QtQuickControls] {TreeView} + \li \l [QML QtQuickControls] {TreeView} \li No equivalent \endtable -- cgit v1.2.3