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

4 files changed, 180 insertions, 0 deletions

diff --git a/tests/auto/qprocess/qprocess.pro b/tests/auto/qprocess/qprocess.pro
index 57d15ad135..047828a0c6 100644
--- a/tests/auto/qprocess/qprocess.pro
+++ b/tests/auto/qprocess/qprocess.pro
@@ -4,6 +4,7 @@ SUBDIRS = testProcessCrash \
           testProcessEcho \
           testProcessEcho2 \
           testProcessEcho3 \
+          testProcessEnvironment \
           testProcessLoopback \
           testProcessNormal \
           testProcessOutput \
diff --git a/tests/auto/qprocess/testProcessEnvironment/main.cpp b/tests/auto/qprocess/testProcessEnvironment/main.cpp
new file mode 100644
index 0000000000..b5e75bcfd1
--- /dev/null
+++ b/tests/auto/qprocess/testProcessEnvironment/main.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** 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.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+#if defined(_WIN32_WCE)
+    // no environment in Windows CE
+    return 0;
+#else
+    if (argc == 1)
+        return 1;
+
+    char *env = getenv(argv[1]);
+    if (env) {
+        printf("%s", env);
+        return 0;
+    }
+    return 1;
+#endif
+}
diff --git a/tests/auto/qprocess/testProcessEnvironment/testProcessEnvironment.pro b/tests/auto/qprocess/testProcessEnvironment/testProcessEnvironment.pro
new file mode 100644
index 0000000000..14ddae50f3
--- /dev/null
+++ b/tests/auto/qprocess/testProcessEnvironment/testProcessEnvironment.pro
@@ -0,0 +1,12 @@
+SOURCES = main.cpp
+CONFIG -= qt
+CONFIG += console
+DESTDIR = ./
+
+mac {
+  CONFIG -= app_bundle
+}
+
+# no install rule for application used by test
+INSTALLS =
+
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index 8101708047..3de981944b 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -128,6 +128,8 @@ private slots:
     void spaceArgsTest_data();
     void spaceArgsTest();
     void exitCodeTest();
+    void setEnvironment_data();
+    void setEnvironment();
     void systemEnvironment();
     void spaceInName();
     void lockupsInStartDetached();
@@ -1780,13 +1782,117 @@ void tst_QProcess::removeFileWhileProcessIsRunning()
 }
 
 //-----------------------------------------------------------------------------
+void tst_QProcess::setEnvironment_data()
+{
+    QTest::addColumn<QString>("name");
+    QTest::addColumn<QString>("value");
+
+    QTest::newRow("setting-empty") << "tst_QProcess" << "";
+    QTest::newRow("setting") << "tst_QProcess" << "value";
+
+#ifdef Q_OS_WIN
+    QTest::newRow("unsetting") << "PROMPT" << QString();
+    QTest::newRow("overriding") << "PROMPT" << "value";
+#else
+    QTest::newRow("unsetting") << "PATH" << QString();
+    QTest::newRow("overriding") << "PATH" << "value";
+#endif
+}
+
+void tst_QProcess::setEnvironment()
+{
+#if !defined (Q_OS_WINCE)
+    // there is no concept of system variables on Windows CE as there is no console
+
+    // make sure our environment variables are correct
+    QVERIFY(qgetenv("tst_QProcess").isEmpty());
+    QVERIFY(!qgetenv("PATH").isEmpty());
+#ifdef Q_OS_WIN
+    QVERIFY(!qgetenv("PROMPT").isEmpty());
+#endif
+
+    QFETCH(QString, name);
+    QFETCH(QString, value);
+    QString executable = QDir::currentPath() + "/testProcessEnvironment/testProcessEnvironment";
+
+    {
+        QProcess process;
+        QStringList environment = QProcess::systemEnvironment();
+        if (value.isNull()) {
+            int pos;
+            QRegExp rx(name + "=.*");
+#ifdef Q_OS_WIN
+            rx.setCaseSensitivity(Qt::CaseInsensitive);
+#endif
+            while ((pos = environment.indexOf(rx)) != -1)
+                environment.removeAt(pos);
+        } else {
+            environment.append(name + '=' + value);
+        }
+        process.setEnvironment(environment);
+        process.start(executable, QStringList() << name);
+
+        QVERIFY(process.waitForFinished());
+        if (value.isNull())
+            QCOMPARE(process.exitCode(), 1);
+        else if (!value.isEmpty())
+            QCOMPARE(process.exitCode(), 0);
+
+        QCOMPARE(process.readAll(), value.toLocal8Bit());
+    }
+
+    // re-do the test but set the environment twice, to make sure
+    // that the latter addition overrides
+    // this test doesn't make sense in unsetting
+    if (!value.isNull()) {
+        QProcess process;
+        QStringList environment = QProcess::systemEnvironment();
+        environment.prepend(name + "=This is not the right value");
+        environment.append(name + '=' + value);
+        process.setEnvironment(environment);
+        process.start(executable, QStringList() << name);
+
+        QVERIFY(process.waitForFinished());
+        if (!value.isEmpty())
+            QCOMPARE(process.exitCode(), 0);
+
+        QCOMPARE(process.readAll(), value.toLocal8Bit());
+    }
+
+    // use the hash variant now
+    {
+        QProcess process;
+        QHash<QString, QString> environment = QProcess::systemEnvironmentHash();
+        if (value.isNull())
+            environment.remove(name);
+        else
+            environment.insert(name, value);
+        process.setEnvironmentHash(environment);
+        process.start(executable, QStringList() << name);
+
+        QVERIFY(process.waitForFinished());
+        if (value.isNull())
+            QCOMPARE(process.exitCode(), 1);
+        else if (!value.isEmpty())
+            QCOMPARE(process.exitCode(), 0);
+
+        QCOMPARE(process.readAll(), value.toLocal8Bit());
+    }
+#endif
+}
+//-----------------------------------------------------------------------------
 void tst_QProcess::systemEnvironment()
 {
 #if defined (Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     // there is no concept of system variables on Windows CE as there is no console
     QVERIFY(QProcess::systemEnvironment().isEmpty());
+    QVERIFY(QProcess::systemEnvironmentHash().isEmpty());
 #else
     QVERIFY(!QProcess::systemEnvironment().isEmpty());
+    QVERIFY(!QProcess::systemEnvironmentHash().isEmpty());
+
+    QVERIFY(QProcess::systemEnvironmentHash().contains("PATH"));
+    QVERIFY(!QProcess::systemEnvironment().filter(QRegExp("^PATH=", Qt::CaseInsensitive)).isEmpty());
 #endif
 }