diff options
author | Thomas McGuire <thomas.mcguire@kdab.com> | 2013-03-13 10:43:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 17:41:24 +0100 |
commit | ddb4935823e9682cbe9fa03869ee5d1771c15feb (patch) | |
tree | 3a9bf1be5fde6033b26829b73bddeec1a6b331c8 /src/quick | |
parent | 02ac995b882fc839fac940a12461f80af1dc2d21 (diff) |
Fix usages of \since for QML items
\since uses the QML import, not the Qt version.
When adding a new property, it needs a REVISION argument and the type
needs to be registered again for the new version.
Change-Id: I2e636e9d26c8e989729eadad2ef73a836c35caa1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 1 | ||||
-rw-r--r-- | src/quick/items/qquickpositioners.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit_p.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 67c4fd2140..022aaa7e3b 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3887,7 +3887,7 @@ void QQuickItem::forceActiveFocus() This method sets focus on the item and ensures that all ancestor FocusScope objects in the object hierarchy are also given \l focus. - \since 5.1 + \since QtQuick 2.1 \sa activeFocus, Qt::FocusReason */ diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 5321f5e588..20c35f42f2 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -228,6 +228,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #endif qmlRegisterType<QQuickGrid, 1>(uri, 2, 1, "Grid"); + qmlRegisterType<QQuickTextEdit, 1>(uri, 2, 1, "TextEdit"); } void QQuickItemsModule::defineModule() diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index df80e77bfa..4a74c0bfba 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -1180,7 +1180,7 @@ void QQuickGrid::setFlow(Flow flow) By default this property is not set. \sa columnSpacing - \since QtQuick2.0 + \since QtQuick 2.0 */ void QQuickGrid::setRowSpacing(const qreal rowSpacing) { @@ -1202,7 +1202,7 @@ void QQuickGrid::setRowSpacing(const qreal rowSpacing) By default this property is not set. \sa rowSpacing - \since QtQuick2.0 + \since QtQuick 2.0 */ void QQuickGrid::setColumnSpacing(const qreal columnSpacing) { diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 9d28bc7963..0fe5458c34 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -2190,7 +2190,7 @@ void QQuickTextEdit::remove(int start, int end) /*! \qmlproperty TextDocument QtQuick2::TextEdit::textDocument - \since 5.1 + \since QtQuick 2.1 Returns the QQuickTextDocument of this TextEdit. It can be used to implement syntax highlighting using diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 149d26f98e..255c8ac670 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -100,7 +100,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem #endif Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl RESET resetBaseUrl NOTIFY baseUrlChanged) Q_PROPERTY(RenderType renderType READ renderType WRITE setRenderType NOTIFY renderTypeChanged) - Q_PROPERTY(QQuickTextDocument *textDocument READ textDocument FINAL) + Q_PROPERTY(QQuickTextDocument *textDocument READ textDocument FINAL REVISION 1) public: QQuickTextEdit(QQuickItem *parent=0); |