diff options
author | Oleg Shparber <trollixx@gmail.com> | 2014-10-04 14:28:22 -0700 |
---|---|---|
committer | Oleg Shparber <trollixx@gmail.com> | 2014-10-09 16:22:06 +0200 |
commit | 18daa3e282cf8c32ce93e26e81504f38161600f3 (patch) | |
tree | f238db413be1f4e4a60c8e4fb8ec68f94a7c3782 /src/quick/items/qquickitem.cpp | |
parent | 9413d62f6120c8be509bb46adf75ce302550e0b3 (diff) |
Make QQuickKeyNavigationAttached respect user set values
Before this change, when user tried to set KeyNavigation property
to the value which was previously automatically assigned, user set
flag wasn't raised. Such behavior led to situations, when explicitly
set values later were not respected by automatic mutual changes.
Change-Id: Id5ba5061c03a61f4d7835a638dc746b1485b9a56
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index b8362c9dac..ebe136e556 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -452,7 +452,7 @@ QQuickItem *QQuickKeyNavigationAttached::left() const void QQuickKeyNavigationAttached::setLeft(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->left == i) + if (d->leftSet && d->left == i) return; d->left = i; d->leftSet = true; @@ -474,7 +474,7 @@ QQuickItem *QQuickKeyNavigationAttached::right() const void QQuickKeyNavigationAttached::setRight(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->right == i) + if (d->rightSet && d->right == i) return; d->right = i; d->rightSet = true; @@ -496,7 +496,7 @@ QQuickItem *QQuickKeyNavigationAttached::up() const void QQuickKeyNavigationAttached::setUp(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->up == i) + if (d->upSet && d->up == i) return; d->up = i; d->upSet = true; @@ -518,7 +518,7 @@ QQuickItem *QQuickKeyNavigationAttached::down() const void QQuickKeyNavigationAttached::setDown(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->down == i) + if (d->downSet && d->down == i) return; d->down = i; d->downSet = true; @@ -540,7 +540,7 @@ QQuickItem *QQuickKeyNavigationAttached::tab() const void QQuickKeyNavigationAttached::setTab(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->tab == i) + if (d->tabSet && d->tab == i) return; d->tab = i; d->tabSet = true; @@ -562,7 +562,7 @@ QQuickItem *QQuickKeyNavigationAttached::backtab() const void QQuickKeyNavigationAttached::setBacktab(QQuickItem *i) { Q_D(QQuickKeyNavigationAttached); - if (d->backtab == i) + if (d->backtabSet && d->backtab == i) return; d->backtab = i; d->backtabSet = true; |