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

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 5811938e3c..7215852347 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -193,21 +193,19 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
 
 tst_Suite::tst_Suite()
 {
-    testsDir = QDir(".");
-    if (!testsDir.cd("tests")) {
+    testsDir = QDir(SRCDIR);
+    bool testsFound = testsDir.cd("tests");
+    if (!testsFound) {
         qWarning("*** no tests/ dir!");
-        return;
-    }
-    if (!testsDir.exists("mjsunit.js")) {
-        qWarning("*** no tests/mjsunit.js file!");
-        return;
-    }
-    mjsunitContents = readFile(testsDir.absoluteFilePath("mjsunit.js"));
-    if (mjsunitContents.isEmpty()) {
-        qWarning("*** tests/mjsunit.js is empty!");
-        return;
+    } else {
+        if (!testsDir.exists("mjsunit.js"))
+            qWarning("*** no tests/mjsunit.js file!");
+        else {
+            mjsunitContents = readFile(testsDir.absoluteFilePath("mjsunit.js"));
+            if (mjsunitContents.isEmpty())
+                qWarning("*** tests/mjsunit.js is empty!");
+        }
     }
-
     QString willFixInNextReleaseMessage = QString::fromLatin1("Will fix in next release");
     addExpectedFailure("apply", "morundefineder", "morseper", willFixInNextReleaseMessage);
     addExpectedFailure("arguments-enum", "2", "0", willFixInNextReleaseMessage);
@@ -275,7 +273,9 @@ tst_Suite::tst_Suite()
     appendCString(stringdata, "tst_Suite");
     appendCString(stringdata, "");
 
-    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    QFileInfoList testFileInfos;
+    if (testsFound)
+        testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
     foreach (QFileInfo tfi, testFileInfos) {
         QString name = tfi.baseName();
         // slot: signature, parameters, type, tag, flags