summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-12-06 14:26:08 (GMT)
committeraxis <qt-info@nokia.com>2010-12-07 07:28:10 (GMT)
commitf48a99165e0f3a63b3b144e1a7c7ce586bfc96c4 (patch)
treeb940fdb92f653fa9d8165339f20b36de36156fd7 /src/gui/kernel
parent6af078b2a13f4855a35d48376e58154ee2d57ec1 (diff)
downloadQt-f48a99165e0f3a63b3b144e1a7c7ce586bfc96c4.zip
Qt-f48a99165e0f3a63b3b144e1a7c7ce586bfc96c4.tar.gz
Qt-f48a99165e0f3a63b3b144e1a7c7ce586bfc96c4.tar.bz2
Fixed a BC break between S60 SDK 3.2 and 5.0.
Task: QT-4077 RevBy: Shane Kearns
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qeventdispatcher_s60_p.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/kernel/qeventdispatcher_s60_p.h
index c14fef0..539a21c 100644
--- a/src/gui/kernel/qeventdispatcher_s60_p.h
+++ b/src/gui/kernel/qeventdispatcher_s60_p.h
@@ -75,6 +75,13 @@ public:
void complete();
private:
+ // Workaround for a BC break from S60 3.2 -> 5.0, where the CEikonEnv override was removed.
+ // To avoid linking to that when we build against 3.2, define an empty body here.
+ // Reserved_*() have been verified to be empty in the S60 code.
+ void Reserved_1() {}
+ void Reserved_2() {}
+
+private:
int m_lastIterationCount;
TInt m_savedStatusCode;
bool m_hasAlreadyRun;