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

3 files changed, 351 insertions, 0 deletions

diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
new file mode 100644
index 0000000..6aae015
--- /dev/null
+++ b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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 "seek_ai.h"
+
+QState *SeekAi::create(QState *parentState, QObject *tank)
+{
+    QState *topLevel = new QState(parentState);
+    topLevel->setObjectName("topLevel");
+
+    QState *seek = new QState(topLevel);
+    seek->setObjectName("seek");
+    topLevel->setInitialState(seek);
+
+    QState *lookForNearestWall = new SearchState(tank, seek);
+    lookForNearestWall->setObjectName("lookForNearestWall");
+    seek->setInitialState(lookForNearestWall);
+
+    QState *driveToFirstObstacle = new QState(seek);
+    driveToFirstObstacle->setObjectName("driveToFirstObstacle");
+    lookForNearestWall->addTransition(lookForNearestWall, SIGNAL(nearestObstacleStraightAhead()),
+        driveToFirstObstacle);
+
+    QState *drive = new QState(driveToFirstObstacle);
+    drive->setObjectName("drive");
+    driveToFirstObstacle->setInitialState(drive);
+    connect(drive, SIGNAL(entered()), tank, SLOT(moveForwards()));
+    connect(drive, SIGNAL(exited()), tank, SLOT(stop()));
+
+    // Go in loop
+    QState *finishedDriving = new QState(driveToFirstObstacle);
+    finishedDriving->setObjectName("finishedDriving");
+    drive->addTransition(tank, SIGNAL(actionCompleted()), finishedDriving);
+    finishedDriving->addTransition(drive);
+
+    QState *turnTo = new QState(seek);
+    turnTo->setObjectName("turnTo");
+    driveToFirstObstacle->addTransition(new CollisionTransition(tank, turnTo));
+
+    turnTo->addTransition(tank, SIGNAL(actionCompleted()), driveToFirstObstacle);
+
+    ChaseState *chase = new ChaseState(tank, topLevel);
+    chase->setObjectName("chase");
+    seek->addTransition(new TankSpottedTransition(tank, chase));
+    chase->addTransition(chase, SIGNAL(finished()), driveToFirstObstacle);
+    chase->addTransition(new TankSpottedTransition(tank, chase));
+
+    return topLevel;
+}
+
+Q_EXPORT_PLUGIN2(seek_ai, SeekAi)
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
new file mode 100644
index 0000000..e44ad07
--- /dev/null
+++ b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples 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$
+**
+****************************************************************************/
+
+#ifndef SEEK_AI_H
+#define SEEK_AI_H
+
+#include <tankgame/plugin.h>
+
+#include <QState>
+#include <QFinalState>
+#include <QSignalTransition>
+#include <QSignalEvent>
+#include <QVariant>
+#include <QLineF>
+#include <QDebug>
+
+class SearchState: public QState
+{
+    Q_OBJECT
+public:
+    SearchState(QObject *tank, QState *parentState = 0)
+        : QState(parentState),
+          m_tank(tank),
+          m_distanceToTurn(360.0),
+          m_nearestDistance(-1.0),
+          m_directionOfNearestObstacle(0.0)
+    {
+    }
+
+public slots:
+    void turnAlittle()
+    {
+        qreal dist = m_tank->property("distanceToObstacle").toDouble();
+
+        if (m_nearestDistance < 0.0 || dist < m_nearestDistance) {
+            m_nearestDistance = dist;
+            m_directionOfNearestObstacle = m_tank->property("direction").toDouble();
+        }
+
+        m_distanceToTurn -= 10.0;
+        if (m_distanceToTurn < 0.0) {
+            disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
+            connect(m_tank, SIGNAL(actionCompleted()), this, SIGNAL(nearestObstacleStraightAhead()));
+            m_tank->setProperty("direction", m_directionOfNearestObstacle);
+        }
+
+        qreal currentDirection = m_tank->property("direction").toDouble();
+        m_tank->setProperty("direction", currentDirection + 10.0);
+    }
+
+signals:
+    void nearestObstacleStraightAhead();
+
+protected:
+    void onEntry(QEvent *)
+    {
+        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
+        turnAlittle();
+    }
+
+    void onExit(QEvent *)
+    {
+        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle()));
+        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(nearestObstacleStraightAhead()));
+    }
+
+private:
+    QObject *m_tank;
+
+    qreal m_distanceToTurn;
+    qreal m_nearestDistance;
+    qreal m_directionOfNearestObstacle;
+};
+
+class CollisionTransition: public QSignalTransition
+{
+public:
+    CollisionTransition(QObject *tank, QState *turnTo)
+        : QSignalTransition(tank, SIGNAL(collision(QLineF))),
+          m_tank(tank),
+          m_turnTo(turnTo)
+    {
+        setTargetState(turnTo);
+    }
+
+protected:
+    bool eventTest(QEvent *event)
+    {
+        bool b = QSignalTransition::eventTest(event);
+        if (b) {
+            QSignalEvent *se = static_cast<QSignalEvent *>(event);
+            m_lastLine = se->arguments().at(0).toLineF();
+        }
+        return b;
+    }
+
+    void onTransition(QEvent *)
+    {
+        qreal angleOfWall = m_lastLine.angle();
+
+        qreal newDirection;
+        if (qrand() % 2 == 0)
+            newDirection = angleOfWall;
+        else
+            newDirection = angleOfWall - 180.0;
+
+        m_turnTo->assignProperty(m_tank, "direction", newDirection);
+    }
+
+private:
+    QLineF m_lastLine;
+    QObject *m_tank;
+    QState *m_turnTo;
+};
+
+class ChaseState: public QState
+{
+    class GoToLocationState: public QState
+    {
+    public:
+        GoToLocationState(QObject *tank, QState *parentState = 0)
+            : QState(parentState), m_tank(tank), m_distance(0.0)
+        {
+        }
+
+        void setDistance(qreal distance) { m_distance = distance; }
+
+    protected:
+        void onEntry()
+        {
+            QMetaObject::invokeMethod(m_tank, "moveForwards", Q_ARG(qreal, m_distance));
+        }
+
+    private:
+        QObject *m_tank;
+        qreal m_distance;
+    };
+
+public:
+    ChaseState(QObject *tank, QState *parentState = 0) : QState(parentState), m_tank(tank)
+    {
+        QState *fireCannon = new QState(this);
+        fireCannon->setObjectName("fireCannon");
+        connect(fireCannon, SIGNAL(entered()), tank, SLOT(fireCannon()));
+        setInitialState(fireCannon);
+
+        m_goToLocation = new GoToLocationState(tank, this);
+        m_goToLocation->setObjectName("goToLocation");
+        fireCannon->addTransition(tank, SIGNAL(actionCompleted()), m_goToLocation);
+
+        m_turnToDirection = new QState(this);
+        m_turnToDirection->setObjectName("turnToDirection");
+        m_goToLocation->addTransition(tank, SIGNAL(actionCompleted()), m_turnToDirection);
+
+        QFinalState *finalState = new QFinalState(this);
+        finalState->setObjectName("finalState");
+        m_turnToDirection->addTransition(tank, SIGNAL(actionCompleted()), finalState);
+    }
+
+    void setDirection(qreal direction)
+    {
+        m_turnToDirection->assignProperty(m_tank, "direction", direction);
+    }
+
+    void setDistance(qreal distance)
+    {
+        m_goToLocation->setDistance(distance);
+    }
+
+private:
+    QObject *m_tank;
+    GoToLocationState *m_goToLocation;
+    QState *m_turnToDirection;
+
+};
+
+class TankSpottedTransition: public QSignalTransition
+{
+public:
+    TankSpottedTransition(QObject *tank, ChaseState *target) : QSignalTransition(tank, SIGNAL(tankSpotted(qreal,qreal))), m_chase(target)
+    {
+        setTargetState(target);
+    }
+
+protected:
+    bool eventTest(QEvent *event)
+    {
+        bool b = QSignalTransition::eventTest(event);
+        if (b) {
+            QSignalEvent *se = static_cast<QSignalEvent *>(event);
+            m_chase->setDirection(se->arguments().at(0).toDouble());
+            m_chase->setDistance(se->arguments().at(1).toDouble());
+        }
+        return b;
+    }
+
+private:
+    ChaseState *m_chase;
+};
+
+class SeekAi: public QObject, public Plugin
+{
+    Q_OBJECT
+    Q_INTERFACES(Plugin)
+public:
+    SeekAi() { setObjectName("Seek and destroy"); }
+
+    virtual QState *create(QState *parentState, QObject *tank);
+};
+
+#endif
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro
new file mode 100644
index 0000000..0d8bf2e
--- /dev/null
+++ b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro
@@ -0,0 +1,13 @@
+TEMPLATE      = lib
+CONFIG       += plugin
+INCLUDEPATH  += ../..
+HEADERS       = seek_ai.h
+SOURCES       = seek_ai.cpp
+TARGET        = $$qtLibraryTarget(seek_ai)
+DESTDIR       = ../../tankgame/plugins
+
+#! [0]
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS seek_ai.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/seek_ai
\ No newline at end of file