Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	mkspecs/features/symbian/symbian_building.prf
	src/network/access/qhttpnetworkconnectionchannel.cpp

2 files changed, 0 insertions, 19 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 1262340..6fb3689 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -112,8 +112,6 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** End of generated data ***
 };
 
-QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0;
-
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
 
 // theme background texture
@@ -154,8 +152,6 @@ const double KTabFontMul = 0.72;
 
 QS60StylePrivate::~QS60StylePrivate()
 {
-    delete m_autoFillDisabledWidgets;
-    m_autoFillDisabledWidgets = 0;
     clearCaches(); //deletes also background image
     deleteThemePalette();
 #ifdef Q_WS_S60
@@ -3188,13 +3184,6 @@ void QS60Style::polish(QWidget *widget)
     }
     d->setThemePalette(widget);
     d->setFont(widget);
-    
-    if (widget->autoFillBackground()) {
-        if (!d->m_autoFillDisabledWidgets)
-            d->m_autoFillDisabledWidgets = new QSet<const QWidget *>;
-        widget->setAutoFillBackground(false);
-        d->m_autoFillDisabledWidgets->insert(widget);
-    }
 }
 
 /*!
@@ -3229,13 +3218,6 @@ void QS60Style::unpolish(QWidget *widget)
 
     if (widget)
         widget->setPalette(QPalette());
-    
-    if (d->m_autoFillDisabledWidgets &&
-	    !d->m_autoFillDisabledWidgets->isEmpty() &&
-		d->m_autoFillDisabledWidgets->contains(widget)) {
-        widget->setAutoFillBackground(true);
-        d->m_autoFillDisabledWidgets->remove(widget);
-    }
 
 #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR)
     if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) {
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 3d66c40..b46f75e 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -625,7 +625,6 @@ private:
     static qint64 m_webPaletteKey;
 
     static QPointer<QWidget> m_pressedWidget;
-    static QSet<const QWidget *> *m_autoFillDisabledWidgets;
 
 #ifdef Q_WS_S60
     //list of progress bars having animation running