diff options
| author | Venugopal Shivashankar <venugopal.shivashankar@digia.com> | 2015-09-24 11:17:03 +0200 |
|---|---|---|
| committer | Venugopal Shivashankar <venugopal.shivashankar@digia.com> | 2015-09-28 08:58:55 +0000 |
| commit | c6b5986f8339d451ffbc6fc96b47882d5d8f6221 (patch) | |
| tree | 5efef55249686a3c4709373bfd9886328038f715 /src | |
| parent | 82559c068a6000e0a048ddb3590fc03761f236b7 (diff) | |
Doc: Fixes required to avoid the following qdoc warnings
qtquickcontrols2-index.qdoc:28: warning: Can't link to 'No'
qquickstackview.cpp:46: warning: Can't link to 'replace()'
Change-Id: I44cc2fab7d6b745175d0cbd3636b8025eb415c70
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-index.qdoc | 2 | ||||
| -rw-r--r-- | src/templates/qquickstackview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 3c76a202..d6c5ac6a 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -204,7 +204,7 @@ \li Qt Quick Controls 2 \row \li \l [QtQuickControls] {Action} - \li \l No equivalent; see \l [QtQuick] {Shortcut} instead. + \li No equivalent; see \l [QtQuick] {Shortcut} instead. \row \li \l [QtQuickControls] {ApplicationWindow} \li \l [QtQuickControls2] {ApplicationWindow} diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 13b08707..4919ae70 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -483,7 +483,7 @@ void QQuickStackView::pop(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation = Transition) + \qmlmethod Item QtQuick.Controls::StackView::replace(item, properties, operation = Transition) TODO */ |