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

2 files changed, 151 insertions, 0 deletions

diff --git a/examples/statemachine/pingpong/main.cpp b/examples/statemachine/pingpong/main.cpp
new file mode 100644
index 0000000..586b422
--- /dev/null
+++ b/examples/statemachine/pingpong/main.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtCore module 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 <QtCore>
+#include <stdio.h>
+
+//! [0]
+class PingEvent : public QEvent
+{
+public:
+    PingEvent() : QEvent(QEvent::Type(QEvent::User+2))
+        {}
+};
+
+class PongEvent : public QEvent
+{
+public:
+    PongEvent() : QEvent(QEvent::Type(QEvent::User+3))
+        {}
+};
+//! [0]
+
+//! [1]
+class Pinger : public QState
+{
+public:
+    Pinger(QState *parent)
+        : QState(parent) {}
+
+protected:
+    virtual void onEntry(QEvent *)
+    {
+        machine()->postEvent(new PingEvent());
+        fprintf(stdout, "ping?\n");
+    }
+};
+//! [1]
+
+//! [3]
+class PongTransition : public QAbstractTransition
+{
+public:
+    PongTransition() {}
+
+protected:
+    virtual bool eventTest(QEvent *e) {
+        return (e->type() == QEvent::User+3);
+    }
+    virtual void onTransition(QEvent *)
+    {
+        machine()->postEvent(new PingEvent(), 500);
+        fprintf(stdout, "ping?\n");
+    }
+};
+//! [3]
+
+//! [2]
+class PingTransition : public QAbstractTransition
+{
+public:
+    PingTransition() {}
+
+protected:
+    virtual bool eventTest(QEvent *e) {
+        return (e->type() == QEvent::User+2);
+    }
+    virtual void onTransition(QEvent *)
+    {
+        machine()->postEvent(new PongEvent(), 500);
+        fprintf(stdout, "pong!\n");
+    }
+};
+//! [2]
+
+//! [4]
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QStateMachine machine;
+    QState *group = new QState(QState::ParallelStates);
+    group->setObjectName("group");
+//! [4]
+
+//! [5]
+    Pinger *pinger = new Pinger(group);
+    pinger->setObjectName("pinger");
+    pinger->addTransition(new PongTransition());
+
+    QState *ponger = new QState(group);
+    ponger->setObjectName("ponger");
+    ponger->addTransition(new PingTransition());
+//! [5]
+
+//! [6]
+    machine.addState(group);
+    machine.setInitialState(group);
+    machine.start();
+
+    return app.exec();
+}
+//! [6]
diff --git a/examples/statemachine/pingpong/pingpong.pro b/examples/statemachine/pingpong/pingpong.pro
new file mode 100644
index 0000000..42eab6c
--- /dev/null
+++ b/examples/statemachine/pingpong/pingpong.pro
@@ -0,0 +1,11 @@
+QT = core
+win32: CONFIG += console
+mac:CONFIG -= app_bundle
+
+SOURCES = main.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/pingpong
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/pingpong
+INSTALLS += target sources