Merge commit 'origin/master' into softkeys

7 files changed, 21 insertions, 7 deletions

diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
index bf8443d..b2f3dd4 100644
--- a/examples/network/securesocketclient/sslclient.cpp
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -145,7 +145,9 @@ void SslClient::socketEncrypted()
     if (!padLock) {
         padLock = new QToolButton;
         padLock->setIcon(QIcon(":/encrypted.png"));
+#ifndef QT_NO_CURSOR
         padLock->setCursor(Qt::ArrowCursor);
+#endif
         padLock->setToolTip(tr("Display encryption details."));
 
         int extent = form->hostNameEdit->height() - 2;
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 930602b..58ee29f 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2589,17 +2589,18 @@ void QS60Style::unpolish(QWidget *widget)
 
 void QS60Style::polish(QApplication *application)
 {
-    Q_D(const QS60Style);
-    originalPalette = application->palette();
+    Q_D(QS60Style);
+    d->m_originalPalette = application->palette();
     d->setThemePalette(application);
 }
 
 void QS60Style::unpolish(QApplication *application)
 {
     Q_UNUSED(application)
-    QPalette newPalette = qApp->style()->standardPalette();
+    Q_D(QS60Style);
+    const QPalette newPalette = QApplication::style()->standardPalette();
     application->setPalette(newPalette);
-    QApplicationPrivate::setSystemPalette(originalPalette);
+    QApplicationPrivate::setSystemPalette(d->m_originalPalette);
 }
 
 void QS60Style::setStyleProperty(const char *name, const QVariant &value)
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index 09c6b00..f6e5473 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -70,7 +70,6 @@ protected slots:
 private:
     Q_DISABLE_COPY(QS60Style)
     friend class QStyleFactory;
-    QPalette originalPalette;
 };
 
 #endif // QT_NO_STYLE_S60
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index c93d271..8a872fc 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -438,6 +438,7 @@ private:
     // Contains background texture.
     static QPixmap *m_background;
     const static SkinElementFlags KDefaultSkinElementFlags;
+    QPalette m_originalPalette;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index b6ad0ac..7131640 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -268,11 +268,14 @@ void QS60Style::setS60Theme(const QHash<QString, QPicture> &parts,
     QS60StyleModeSpecifics::m_colors = colors;
     d->clearCaches(QS60StylePrivate::CC_ThemeChange);
     d->setBackgroundTexture(qApp);
+
+    foreach (QWidget *widget, QApplication::allWidgets())
+        d->setThemePalette(widget);
 }
 
 QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 {
-	Q_UNUSED(targetWidget)
+    Q_UNUSED(targetWidget)
     return QPoint();
 }
 
diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro
index 32e2423..7bc9f59 100644
--- a/tests/auto/qlocale/test/test.pro
+++ b/tests/auto/qlocale/test/test.pro
@@ -29,4 +29,11 @@ wince*: {
    DEPLOYMENT += addFiles
 }
 
-
+symbian:contains(S60_VERSION,3.2) {
+    # This test case compilation crashes on 3.2 for gcce if paging is on
+    MMP_RULES -= PAGED
+    custom_paged_rule = "$${LITERAL_HASH}ifndef GCCE"\
+        "PAGED" \
+        "$${LITERAL_HASH}endif"
+    MMP_RULES += custom_paged_rule
+}
\ No newline at end of file
diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/qtablewidget/qtablewidget.pro
index 2b2a016..bcc82bd 100644
--- a/tests/auto/qtablewidget/qtablewidget.pro
+++ b/tests/auto/qtablewidget/qtablewidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 SOURCES  += tst_qtablewidget.cpp
 
+symbian:MMP_RULES += "OPTION   GCCE -mlong-calls"