diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-10 10:00:34 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-10 10:01:52 +0200 |
| commit | 5bf33901429e64ab91f30037e25ec04aab4b4c11 (patch) | |
| tree | 160e993f75f08a602360e5e4aac7cb52aa814036 /src/quick/items/qquickitem.h | |
| parent | 7a99b074b9565473c4cf95a622fc5b7dca278046 (diff) | |
| parent | 8190355557c13bba836cef49585556f0c823f672 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I958754b1f51ecdaf465faa7700d4e57f2df926fc
Diffstat (limited to 'src/quick/items/qquickitem.h')
| -rw-r--r-- | src/quick/items/qquickitem.h | 4 |
1 files changed, 2 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); |