From f48a99165e0f3a63b3b144e1a7c7ce586bfc96c4 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 6 Dec 2010 15:26:08 +0100
Subject: Fixed a BC break between S60 SDK 3.2 and 5.0.

Task:     QT-4077
RevBy:    Shane Kearns
---
 src/gui/kernel/qeventdispatcher_s60_p.h | 7 +++++++
 1 file changed, 7 insertions(+)

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;
-- 
cgit v0.12