diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-04-05 15:39:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 22:44:58 +0200 |
| commit | ce47647e0a5d6783f21317a6d04909713c6c4f92 (patch) | |
| tree | 22692ebbaa5ba2bccc08de080c93e7187e5b879a /src/quick | |
| parent | 2dee884ed947d2b3ba8642456011fdd6fc434d43 (diff) | |
Version new property and signal
activeFocusOnTab and activeFocusOnTabChanged in QQuickItem.
Task-number: QTBUG-30446
Change-Id: I973df95d690b8e533b5cc108d8e083a2fed8528a
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickitem.h | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index c37bc10bdd..040f9d6888 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -132,7 +132,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL) Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL) - Q_PROPERTY(bool activeFocusOnTab READ activeFocusOnTab WRITE setActiveFocusOnTab NOTIFY activeFocusOnTabChanged FINAL) + Q_PROPERTY(bool activeFocusOnTab READ activeFocusOnTab WRITE setActiveFocusOnTab NOTIFY activeFocusOnTabChanged FINAL REVISION 1) Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) @@ -349,7 +349,7 @@ Q_SIGNALS: void stateChanged(const QString &); void focusChanged(bool); void activeFocusChanged(bool); - void activeFocusOnTabChanged(bool); + Q_REVISION(1) void activeFocusOnTabChanged(bool); void parentChanged(QQuickItem *); void transformOriginChanged(TransformOrigin); void smoothChanged(bool); diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index cd49377822..741583a95d 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) qmlRegisterUncreatableType<QQuickAccessibleAttached>("QtQuick", 2, 0, "Accessible",QQuickAccessibleAttached::tr("Accessible is only available via attached properties")); #endif + qmlRegisterType<QQuickItem, 1>(uri, 2, 1,"Item"); qmlRegisterType<QQuickGrid, 1>(uri, 2, 1, "Grid"); qmlRegisterType<QQuickTextEdit, 1>(uri, 2, 1, "TextEdit"); } |