summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-10-13 13:53:19 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-13 14:29:37 (GMT)
commit886588aea9283932185ee06341145233a4684289 (patch)
tree1bef2a7456da6a743c4bc0fac6a90f31bbd12a14
parentc4e15c2ff15d21975410df9bc9615961e448b3d2 (diff)
downloadQt-886588aea9283932185ee06341145233a4684289.zip
Qt-886588aea9283932185ee06341145233a4684289.tar.gz
Qt-886588aea9283932185ee06341145233a4684289.tar.bz2
Modified QSymbianControl::setFocusSafely to set last focused control
to zero only if currently focused Reviewed-by: axis
-rw-r--r--src/gui/kernel/qapplication_s60.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 115e135..6d50e55 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -949,7 +949,8 @@ void QSymbianControl::setFocusSafely(bool focus)
S60->appUi()->RemoveFromStack(this);
QT_TRAP_THROWING(S60->appUi()->AddToStackL(this,
ECoeStackPriorityDefault, ECoeStackFlagStandard));
- lastFocusedControl = 0;
+ if(this == lastFocusedControl)
+ lastFocusedControl = 0;
this->SetFocus(false);
}
}