Merge commit 'origin/master' into 4.6-merged

Conflicts:
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/tools/qdumper.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/kernel/qwidget_s60.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkreplyimpl.cpp
	src/sql/drivers/ibase/qsql_ibase.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/network-settings.h
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qobjectrace/tst_qobjectrace.cpp
	tests/auto/qsqldatabase/tst_qsqldatabase.cpp
	tools/configure/configureapp.cpp
	translations/qt_ru.ts

2 files changed, 6 insertions, 11 deletions

diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro
index f9fed69..8163f26 100644
--- a/tests/auto/qstyle/qstyle.pro
+++ b/tests/auto/qstyle/qstyle.pro
@@ -2,12 +2,11 @@ load(qttest_p4)
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
 SOURCES  += tst_qstyle.cpp
 
-wince*: {
-   addPixmap.sources = task_25863.png
-   addPixmap.path = .
-   DEPLOYMENT += addPixmap
-} else:symbian* {
+wince*|symbian*: {
+   DEFINES += SRCDIR=\\\".\\\"
    addPixmap.sources = task_25863.png
    addPixmap.path = .
    DEPLOYMENT += addPixmap
+} else {
+   DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index d2c63a8..f5e94e3 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -266,12 +266,8 @@ void tst_QStyle::drawItemPixmap()
 {
     testWidget->resize(300, 300);
     testWidget->show();
-#if defined(Q_OS_SYMBIAN)
-    const QString prefix = QLatin1String(SRCDIR) + QLatin1String("/");
-    QPixmap p(prefix+"task_25863.png", "PNG");
-#else
-    QPixmap p("task_25863.png", "PNG");
-#endif
+
+    QPixmap p(QString(SRCDIR) + "/task_25863.png", "PNG");
     QPixmap actualPix = QPixmap::grabWidget(testWidget);
     QVERIFY(pixmapsAreEqual(&actualPix,&p));
     testWidget->hide();