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>

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 67c4fd2..022aaa7 100644 (file)
--- 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 5321f5e..20c35f4 100644 (file)
--- 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 df80e77..4a74c0b 100644 (file)
--- 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 9d28bc7..0fe5458 100644 (file)
--- 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 149d26f..255c8ac 100644 (file)
--- 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);