summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-08-31 11:15:28 (GMT)
committeraxis <qt-info@nokia.com>2010-09-06 08:29:36 (GMT)
commita2e2d2207d3b7f164ba9c9c7fa776e10bb7bc168 (patch)
treef52c5f44adf9e993f6ec36c7c829fe59437bd5ff /src/gui/kernel
parent5eba3f8f449256ace5aa70ab004a63f3e5d79d7a (diff)
downloadQt-a2e2d2207d3b7f164ba9c9c7fa776e10bb7bc168.zip
Qt-a2e2d2207d3b7f164ba9c9c7fa776e10bb7bc168.tar.gz
Qt-a2e2d2207d3b7f164ba9c9c7fa776e10bb7bc168.tar.bz2
Cleaned up position tracking in the Symbian input methods.
This fixed a case where using password mode would lead to Qt believing that the cursor was one step to the left of where it really was. This would have the effect of replacing the last character instead of appending to it, and even crashing if the cursor was all the way to the left. The code is also much cleaner this way, but it meant that QTBUG-9867 had to be solved differently this time. We do this by assuming that and empty FEP update means "erase last character", which seems to work well in practice. Also added a long overdue autotest for the FEP input methods. Most tests pass, but some don't, which I will try to fix later. Task: QTBUG-9867 Task: QTBUG-12949 RevBy: Miikka Heikkinen AutoTest: Included (cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qt_s60_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index bf71062..929043c 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -86,7 +86,7 @@ const TInt KInternalStatusPaneChange = 0x50000000;
//this macro exists because EColor16MAP enum value doesn't exist in Symbian OS 9.2
#define Q_SYMBIAN_ECOLOR16MAP TDisplayMode(13)
-class QS60ThreadLocalData
+class Q_AUTOTEST_EXPORT QS60ThreadLocalData
{
public:
QS60ThreadLocalData();
@@ -154,7 +154,7 @@ public:
#endif
};
-QS60Data* qGlobalS60Data();
+Q_AUTOTEST_EXPORT QS60Data* qGlobalS60Data();
#define S60 qGlobalS60Data()
class QAbstractLongTapObserver