Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits)
  Horizontal lines appearing under entered characters
  Move qts60plugindeployment rule to correct scope
  Skipping tst_QEventLoop::processEventsExcludeSocket for qws
  Fixed compile of tst_qscriptextensionplugin on some Windows configurations
  QS60Style: Checked state is not shown on highlighted itemview item
  Removing unused code after introduction of round robin scheduler
  tst_qeventloop runs the event loop to ensure socket messages arrive
  Schedule Symbian active objects with a round robin scheduler
  Fix the build break for QUrl autotest on Symbian
  Fixed def files for WINSCW
  Fixed def files for ARMV5
  Fix the build break for QStyleSheetStyle autotest on Symbian
  Fix bug about daylight saving missing on Symbian platfrom.
  Fix the build break caused by the missing parameter for QSKIP macro.
  Document the Symbian main window size issue at application start.
  QS60Style: icon is not shown correctly in a menu item in all cases
  QS60Style: Remove 3.x specific code from style
  Fix Coverity issues found from QS60Style
  Removed qts60plugin references also from config.profiles
  Remove s60 plugin dll from the iby file too.
  ...

4 files changed, 6 insertions, 97 deletions

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index e9d58c7..899147f 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1694,7 +1694,7 @@ void qt_init(QApplicationPrivate * /* priv */, int)
         if (commandLine) {
             // After this construction, CEikonEnv will be available from CEikonEnv::Static().
             // (much like our qApp).
-            QtEikonEnv* coe = new QtEikonEnv;
+            CEikonEnv* coe = new CEikonEnv;
             //not using QT_TRAP_THROWING, because coe owns the cleanupstack so it can't be pushed there.
             TRAPD(err, coe->ConstructAppFromCommandLineL(factory, *commandLine));
             if(err != KErrNone) {
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/kernel/qeventdispatcher_s60.cpp
index 3f20c08..d5a2761 100644
--- a/src/gui/kernel/qeventdispatcher_s60.cpp
+++ b/src/gui/kernel/qeventdispatcher_s60.cpp
@@ -45,62 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QtEikonEnv::QtEikonEnv()
-    : m_lastIterationCount(0)
-    , m_savedStatusCode(KRequestPending)
-    , m_hasAlreadyRun(false)
-{
-}
-
-QtEikonEnv::~QtEikonEnv()
-{
-}
-
-void QtEikonEnv::RunL()
-{
-    QEventDispatcherS60 *dispatcher = qobject_cast<QEventDispatcherS60 *>(QAbstractEventDispatcher::instance());
-    if (!dispatcher) {
-        CEikonEnv::RunL();
-        return;
-    }
-
-    if (m_lastIterationCount != dispatcher->iterationCount()) {
-        m_hasAlreadyRun = false;
-        m_lastIterationCount = dispatcher->iterationCount();
-    }
-
-    if (m_hasAlreadyRun) {
-        // Fool the active scheduler into believing we are still waiting for events.
-        // The window server thinks we are not, however.
-        m_savedStatusCode = iStatus.Int();
-        iStatus = KRequestPending;
-        SetActive();
-        dispatcher->queueDeferredActiveObjectsCompletion();
-    } else {
-        m_hasAlreadyRun = true;
-        CEikonEnv::RunL();
-    }
-}
-
-void QtEikonEnv::DoCancel()
-{
-    complete();
-
-    CEikonEnv::DoCancel();
-}
-
-void QtEikonEnv::complete()
-{
-    if (m_hasAlreadyRun) {
-        if (m_savedStatusCode != KRequestPending) {
-            TRequestStatus *status = &iStatus;
-            QEventDispatcherSymbian::RequestComplete(status, m_savedStatusCode);
-            m_savedStatusCode = KRequestPending;
-        }
-        m_hasAlreadyRun = false;
-    }
-}
-
 QEventDispatcherS60::QEventDispatcherS60(QObject *parent)
     : QEventDispatcherSymbian(parent),
       m_noInputEvents(false)
@@ -183,14 +127,4 @@ void QEventDispatcherS60::removeInputEventsForWidget(QObject *object)
     }
 }
 
-// reimpl
-void QEventDispatcherS60::reactivateDeferredActiveObjects()
-{
-    if (S60->qtOwnsS60Environment) {
-        static_cast<QtEikonEnv *>(CCoeEnv::Static())->complete();
-    }
-
-    QEventDispatcherSymbian::reactivateDeferredActiveObjects();
-}
-
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/kernel/qeventdispatcher_s60_p.h
index 49ec568..c7cf2b2 100644
--- a/src/gui/kernel/qeventdispatcher_s60_p.h
+++ b/src/gui/kernel/qeventdispatcher_s60_p.h
@@ -62,31 +62,6 @@ QT_BEGIN_NAMESPACE
 
 class QEventDispatcherS60;
 
-class QtEikonEnv : public CEikonEnv
-{
-public:
-    QtEikonEnv();
-    ~QtEikonEnv();
-
-    // from CActive.
-    void RunL();
-    void DoCancel();
-
-    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;
-};
-
 class Q_GUI_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian
 {
     Q_OBJECT
@@ -102,8 +77,6 @@ public:
 
     void saveInputEvent(QSymbianControl *control, QWidget *widget, QInputEvent *event);
 
-    void reactivateDeferredActiveObjects();
-
 private:
     bool sendDeferredInputEvents();
 
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 7d7c56f..44fd877 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -193,9 +193,11 @@ void QSoftKeyManager::sendKeyEvent()
 
 void QSoftKeyManager::updateSoftKeys()
 {
-    QSoftKeyManager::instance()->d_func()->pendingUpdate = true;
-    QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
-    QApplication::postEvent(QSoftKeyManager::instance(), event);
+    if (QApplication::activeWindow()) {
+        QSoftKeyManager::instance()->d_func()->pendingUpdate = true;
+        QEvent *event = new QEvent(QEvent::UpdateSoftKeys);
+        QApplication::postEvent(QSoftKeyManager::instance(), event);
+    }
 }
 
 bool QSoftKeyManager::appendSoftkeys(const QWidget &source, int level)