Merge commit 'qt/master-stable' into 4.6-stable

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

1 files changed, 41 insertions, 1 deletions

diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index e020f9e..c555a5c 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -58,6 +58,7 @@
 #include <qcdestyle.h>
 #include <qmotifstyle.h>
 #include <qcommonstyle.h>
+#include <qproxystyle.h>
 #include <qstylefactory.h>
 
 #include <qimagereader.h>
@@ -140,6 +141,7 @@ private slots:
     void testWindowsMobileStyle();
     void testS60Style();
     void testStyleFactory();
+    void testProxyStyle();
     void pixelMetric();
     void progressBarChangeStyle();
     void defaultFont();
@@ -222,6 +224,44 @@ void tst_QStyle::testStyleFactory()
     }
 }
 
+class CustomProxy : public QProxyStyle
+{
+    virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
+                            const QWidget *widget = 0) const
+    {
+        if (metric == QStyle::PM_ButtonIconSize)
+            return 13;
+        return QProxyStyle::pixelMetric(metric, option, widget);
+    }
+};
+
+void tst_QStyle::testProxyStyle()
+{
+    QProxyStyle *proxyStyle = new QProxyStyle();
+    QVERIFY(proxyStyle->baseStyle());
+    QStyle *style = new QWindowsStyle;
+    QVERIFY(style->proxy() == style);
+
+    proxyStyle->setBaseStyle(style);
+    QVERIFY(style->proxy() == proxyStyle);
+    QVERIFY(style->parent() == proxyStyle);
+    QVERIFY(proxyStyle->baseStyle() == style);
+
+    testAllFunctions(proxyStyle);
+    proxyStyle->setBaseStyle(0);
+    QVERIFY(proxyStyle->baseStyle());
+    qApp->setStyle(proxyStyle);
+
+    QProxyStyle doubleProxy(new QProxyStyle(new QWindowsStyle()));
+    testAllFunctions(&doubleProxy);
+
+    CustomProxy customStyle;
+    QLineEdit edit;
+    edit.setStyle(&customStyle);
+    QVERIFY(!customStyle.parent());
+    QVERIFY(edit.style()->pixelMetric(QStyle::PM_ButtonIconSize) == 13);
+}
+
 void tst_QStyle::drawItemPixmap()
 {
     testWidget->resize(300, 300);
@@ -324,7 +364,7 @@ void tst_QStyle::testAllFunctions(QStyle *style)
     testScrollBarSubControls(style);
 }
 
-void tst_QStyle::testScrollBarSubControls(QStyle *style)
+void tst_QStyle::testScrollBarSubControls(QStyle *)
 {
 #ifdef Q_OS_WINCE_WM
     if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone())