Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend

Conflicts:
	src/corelib/tools/qregexp.cpp
	src/script/qscriptengine.cpp
	src/script/qscriptvalue.cpp

79 files changed, 809 insertions, 2715 deletions

diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp
index ab14c0b..e83ef56 100644
--- a/examples/activeqt/webbrowser/main.cpp
+++ b/examples/activeqt/webbrowser/main.cpp
@@ -46,8 +46,8 @@
 #include <QMainWindow>
 #include <QAbstractEventDispatcher>
 
-#if defined(Q_OS_WINCE)
-#include "ui_wincemainwindow.h"
+#if defined(Q_WS_WINCE_WM)
+#include "ui_mainwindow_windowsmobile.h"
 #include <windows.h>
 #else
 #include "ui_mainwindow.h"
diff --git a/examples/activeqt/webbrowser/wincemainwindow.ui b/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui
index 98a9ddb..98a9ddb 100644
--- a/examples/activeqt/webbrowser/wincemainwindow.ui
+++ b/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui
diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro
index 992d871..32eac71 100644
--- a/examples/activeqt/webbrowser/webbrowser.pro
+++ b/examples/activeqt/webbrowser/webbrowser.pro
@@ -7,7 +7,7 @@ QTDIR_build:REQUIRES = shared
 HEADERS  = webaxwidget.h
 SOURCES	 = main.cpp
 FORMS	 = mainwindow.ui
-wince*: FORMS = wincemainwindow.ui
+wincewm*: FORMS = mainwindow_windowsmobile.ui
 
 
 # install
diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp
index fe4be1f..97751b2 100644
--- a/examples/animation/appchooser/main.cpp
+++ b/examples/animation/appchooser/main.cpp
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
     QStateMachine machine;
     machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties);
 
-    QState *group = new QState(machine.rootState());
+    QState *group = new QState(&machine);
     group->setObjectName("group");
     QRect selectedRect(86, 86, 128, 128);
 
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index c43e841..97d3f81 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/animation/moveblocks/main.cpp
@@ -108,8 +108,7 @@ class StateSwitcher : public QState
     Q_OBJECT
 public:
     StateSwitcher(QStateMachine *machine)
-        : QState(machine->rootState()), m_machine(machine),
-          m_stateCount(0), m_lastIndex(0)
+        : QState(machine), m_stateCount(0), m_lastIndex(0)
     { }
 //![10]
 
@@ -120,7 +119,7 @@ public:
         while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex)
         { }
         m_lastIndex = n;
-        m_machine->postEvent(new StateSwitchEvent(n));
+        machine()->postEvent(new StateSwitchEvent(n));
     }
     virtual void onExit(QEvent *) {}
 //![11]
@@ -135,7 +134,6 @@ public:
 //![12]
 
 private:
-    QStateMachine *m_machine;
     int m_stateCount;
     int m_lastIndex;
 };
diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp
index b3c28f2..99e04c3 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/animation/states/main.cpp
@@ -124,10 +124,9 @@ int main(int argc, char *argv[])
     scene.addItem(p6);
 
     QStateMachine machine;
-    QState *root = machine.rootState();
-    QState *state1 = new QState(root);
-    QState *state2 = new QState(root);
-    QState *state3 = new QState(root);
+    QState *state1 = new QState(&machine);
+    QState *state2 = new QState(&machine);
+    QState *state3 = new QState(&machine);
     machine.setInitialState(state1);
 
     // State 1
diff --git a/examples/animation/stickman/editor/animationdialog.cpp b/examples/animation/stickman/editor/animationdialog.cpp
deleted file mode 100644
index 853046d..0000000
--- a/examples/animation/stickman/editor/animationdialog.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "animationdialog.h"
-#include "stickman.h"
-#include "animation.h"
-#include "node.h"
-
-#include <QHBoxLayout>
-#include <QStackedWidget>
-#include <QSpinBox>
-#include <QPushButton>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QFileDialog>
-
-AnimationDialog::AnimationDialog(StickMan *stickman, QWidget *parent)
-    : QDialog(parent), m_animation(0), m_stickman(stickman)
-{
-    initUi();    
-}
-
-AnimationDialog::~AnimationDialog()
-{
-    delete m_animation;
-}
-
-void AnimationDialog::initUi() 
-{
-    setWindowTitle("Animation");
-    setEnabled(false);
-
-    // Second page
-    m_currentFrame = new QSpinBox();
-    m_totalFrames = new QSpinBox();
-    m_name = new QLineEdit();
-
-    connect(m_currentFrame, SIGNAL(valueChanged(int)), this, SLOT(currentFrameChanged(int)));
-    connect(m_totalFrames, SIGNAL(valueChanged(int)), this, SLOT(totalFramesChanged(int)));
-    connect(m_name, SIGNAL(textChanged(QString)), this, SLOT(setCurrentAnimationName(QString)));
-
-    QGridLayout *gridLayout = new QGridLayout(this);
-    gridLayout->addWidget(new QLabel("Name:"), 0, 0, 1, 2);
-    gridLayout->addWidget(m_name, 0, 2, 1, 2);
-    gridLayout->addWidget(new QLabel("Frame:"), 1, 0);    
-    gridLayout->addWidget(m_currentFrame, 1, 1);
-    gridLayout->addWidget(new QLabel("of total # of frames: "), 1, 2);
-    gridLayout->addWidget(m_totalFrames, 1, 3);
-}
-
-void AnimationDialog::initFromAnimation()
-{
-    m_currentFrame->setRange(0, m_animation->totalFrames()-1);
-    m_currentFrame->setValue(m_animation->currentFrame());
-
-    m_totalFrames->setRange(1, 1000);
-    m_totalFrames->setValue(m_animation->totalFrames());
-
-    m_name->setText(m_animation->name());
-}
-
-void AnimationDialog::saveAnimation()
-{
-    saveCurrentFrame();
-
-    QString fileName = QFileDialog::getSaveFileName(this, "Save animation");
-
-    QFile file(fileName);
-    if (file.open(QIODevice::WriteOnly))
-        m_animation->save(&file);    
-}
-
-void AnimationDialog::loadAnimation()
-{
-    if (maybeSave() != QMessageBox::Cancel) {
-        QString fileName = QFileDialog::getOpenFileName(this, "Open animation");
-
-        QFile file(fileName);
-        if (file.open(QIODevice::ReadOnly)) {        
-            if (m_animation == 0)
-                newAnimation();
-
-            m_animation->load(&file);
-            stickManFromCurrentFrame();
-            initFromAnimation();
-        }
-    }
-}
-
-QMessageBox::StandardButton AnimationDialog::maybeSave() 
-{
-    if (m_animation == 0)
-        return QMessageBox::No;
-
-    QMessageBox::StandardButton button = QMessageBox::question(this, "Save?", "Do you want to save your changes?", 
-                                                               QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-    if (button == QMessageBox::Save)
-        saveAnimation();   
-
-    return button;                 
-}
-
-void AnimationDialog::newAnimation()
-{    
-    if (maybeSave() != QMessageBox::Cancel) {
-        setEnabled(true);
-        delete m_animation;
-        m_animation = new Animation();
-        initFromAnimation();        
-    }
-}
-
-// Gets the data from the stickman and stores it in current frame
-void AnimationDialog::saveCurrentFrame()
-{
-    int count = m_stickman->nodeCount();
-    m_animation->setNodeCount(count);
-    for (int i=0; i<count; ++i) {
-        QGraphicsItem *node = m_stickman->node(i);
-        m_animation->setNodePos(i, node->pos());
-    }
-}
-
-// Gets the data from the current frame and sets the stickman
-void AnimationDialog::stickManFromCurrentFrame()
-{
-    int count = m_animation->nodeCount();
-    for (int i=0;i<count;++i) {
-        QGraphicsItem *node = m_stickman->node(i);
-        node->setPos(m_animation->nodePos(i));
-    }
-}
-
-void AnimationDialog::currentFrameChanged(int currentFrame)
-{
-    saveCurrentFrame();
-    qDebug("currentFrame: %d", currentFrame);
-    m_animation->setCurrentFrame(currentFrame);    
-    stickManFromCurrentFrame();
-    initFromAnimation();
-}
- 
-void AnimationDialog::totalFramesChanged(int totalFrames)
-{
-    m_animation->setTotalFrames(totalFrames);    
-    stickManFromCurrentFrame();
-    initFromAnimation();
-}
-
-void AnimationDialog::setCurrentAnimationName(const QString &name)
-{
-    m_animation->setName(name);
-}
diff --git a/examples/animation/stickman/editor/animationdialog.h b/examples/animation/stickman/editor/animationdialog.h
deleted file mode 100644
index 293f0d4..0000000
--- a/examples/animation/stickman/editor/animationdialog.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ANIMATIONDIALOG_H
-#define ANIMATIONDIALOG_H
-
-#include <QDialog>
-#include <QMessageBox>
-
-QT_BEGIN_NAMESPACE
-class QSpinBox;
-class QLineEdit;
-QT_END_NAMESPACE
-class StickMan;
-class Animation;
-class AnimationDialog: public QDialog
-{
-    Q_OBJECT
-public:
-    AnimationDialog(StickMan *stickMan, QWidget *parent = 0);
-    ~AnimationDialog();
-
-public slots:    
-    void currentFrameChanged(int currentFrame);
-    void totalFramesChanged(int totalFrames);
-    void setCurrentAnimationName(const QString &name);
-
-    void newAnimation();
-    void saveAnimation();
-    void loadAnimation();
-
-private:
-    void saveCurrentFrame();
-    void stickManFromCurrentFrame();
-    void initFromAnimation();
-    void initUi();
-    QMessageBox::StandardButton maybeSave();
-
-    QSpinBox *m_currentFrame;
-    QSpinBox *m_totalFrames;
-    QLineEdit *m_name;
-    Animation *m_animation;
-    StickMan *m_stickman;
-};
- 
-#endif
diff --git a/examples/animation/stickman/editor/editor.pri b/examples/animation/stickman/editor/editor.pri
deleted file mode 100644
index 7ad9edb..0000000
--- a/examples/animation/stickman/editor/editor.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += $$PWD/animationdialog.cpp $$PWD/mainwindow.cpp
-HEADERS += $$PWD/animationdialog.h $$PWD/mainwindow.h 
diff --git a/examples/animation/stickman/editor/mainwindow.cpp b/examples/animation/stickman/editor/mainwindow.cpp
deleted file mode 100644
index e1d08cc..0000000
--- a/examples/animation/stickman/editor/mainwindow.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-#include "animationdialog.h"
-#include "stickman.h"
-
-#include <QMenuBar>
-#include <QApplication>
-
-MainWindow::MainWindow(StickMan *stickMan)
-{
-    initActions(stickMan);
-}
-
-MainWindow::~MainWindow()
-{
-}
-
-void MainWindow::initActions(StickMan *stickMan)
-{
-    AnimationDialog *dialog = new AnimationDialog(stickMan, this);
-    dialog->show();
-
-    QMenu *fileMenu = menuBar()->addMenu("&File");
-    QAction *loadAction = fileMenu->addAction("&Open");
-    QAction *saveAction = fileMenu->addAction("&Save");
-    QAction *exitAction = fileMenu->addAction("E&xit");
-
-    QMenu *animationMenu = menuBar()->addMenu("&Animation");
-    QAction *newAnimationAction = animationMenu->addAction("&New animation");
-
-    connect(loadAction, SIGNAL(triggered()), dialog, SLOT(loadAnimation()));
-    connect(saveAction, SIGNAL(triggered()), dialog, SLOT(saveAnimation()));
-    connect(exitAction, SIGNAL(triggered()), QApplication::instance(), SLOT(quit()));
-    connect(newAnimationAction, SIGNAL(triggered()), dialog, SLOT(newAnimation()));
-
-}
diff --git a/examples/animation/stickman/graphicsview.cpp b/examples/animation/stickman/graphicsview.cpp
index 760c31b..89f2430 100644
--- a/examples/animation/stickman/graphicsview.cpp
+++ b/examples/animation/stickman/graphicsview.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "graphicsview.h"
-#include "editor/mainwindow.h"
 #include "stickman.h"
 
 #include <QtGui/QKeyEvent>
@@ -53,28 +52,6 @@ void GraphicsView::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Escape)
         close();
-
-#if 0
-    if (e->key() == Qt::Key_F1) {
-        if (m_editor == 0) {
-            QGraphicsScene *scene = new QGraphicsScene;
-            StickMan *stickMan = new StickMan;
-            stickMan->setDrawSticks(true);
-            scene->addItem(stickMan);
-
-            QGraphicsView *view = new QGraphicsView;
-            view->setBackgroundBrush(Qt::black);
-            view->setRenderHints(QPainter::Antialiasing);
-            view->setScene(scene);
-
-            m_editor = new MainWindow(stickMan);
-            m_editor->setCentralWidget(view);
-        }
-
-        m_editor->showMaximized();
-    }
-#endif
-
     emit keyPressed(Qt::Key(e->key()));
 }
 
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index 2a54c82..c761d87 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -108,11 +108,11 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
     m_machine->addDefaultAnimation(m_animationGroup);
 //! [3]
 
-    m_alive = new QState(m_machine->rootState());
+    m_alive = new QState(m_machine);
     m_alive->setObjectName("alive");
     
     // Make it blink when lightning strikes before entering dead animation
-    QState *lightningBlink = new QState(m_machine->rootState());    
+    QState *lightningBlink = new QState(m_machine);    
     lightningBlink->assignProperty(m_stickMan->scene(), "backgroundBrush", Qt::white);
     lightningBlink->assignProperty(m_stickMan, "penColor", Qt::black);
     lightningBlink->assignProperty(m_stickMan, "fillColor", Qt::white);
@@ -126,7 +126,7 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
     QObject::connect(lightningBlink, SIGNAL(exited()), timer, SLOT(stop()));
 //! [5]
   
-    m_dead = new QState(m_machine->rootState());
+    m_dead = new QState(m_machine);
     m_dead->assignProperty(m_stickMan->scene(), "backgroundBrush", Qt::black);
     m_dead->assignProperty(m_stickMan, "penColor", Qt::white);
     m_dead->assignProperty(m_stickMan, "fillColor", Qt::black);
diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro
index 1dbbce9..7f8be33 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@@ -12,8 +12,6 @@ SOURCES += main.cpp \
 
 INCLUDEPATH += $$PWD
 
-include(editor/editor.pri)
-
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp
index d286be5..68e646e 100644
--- a/examples/animation/sub-attaq/boat.cpp
+++ b/examples/animation/sub-attaq/boat.cpp
@@ -142,14 +142,14 @@ Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags)
 
     //We setup the state machien of the boat
     machine = new QStateMachine(this);
-    QState *moving = new QState(machine->rootState());
+    QState *moving = new QState(machine);
     StopState *stopState = new StopState(this, moving);
     machine->setInitialState(moving);
     moving->setInitialState(stopState);
     MoveStateRight *moveStateRight = new MoveStateRight(this, moving);
     MoveStateLeft *moveStateLeft = new MoveStateLeft(this, moving);
-    LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine->rootState());
-    LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine->rootState());
+    LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine);
+    LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine);
 
     //then setup the transitions for the rightMove state
     KeyStopTransition *leftStopRight = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Left);
@@ -216,10 +216,10 @@ Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags)
     launchStateLeft->addTransition(historyState);
     launchStateRight->addTransition(historyState);
 
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     //This state play the destroyed animation
-    QAnimationState *destroyedState = new QAnimationState(machine->rootState());
+    QAnimationState *destroyedState = new QAnimationState(machine);
     destroyedState->setAnimation(destroyAnimation);
 
     //Play a nice animation when the boat is destroyed
diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp
index 454970a..e92a723 100644
--- a/examples/animation/sub-attaq/bomb.cpp
+++ b/examples/animation/sub-attaq/bomb.cpp
@@ -85,11 +85,11 @@ void Bomb::launch(Bomb::Direction direction)
     QStateMachine *machine = new QStateMachine(this);
 
     //This state is when the launch animation is playing
-    QAnimationState *launched = new QAnimationState(machine->rootState());
+    QAnimationState *launched = new QAnimationState(machine);
     launched->setAnimation(launchAnimation);
 
     //End
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     machine->setInitialState(launched);
 
diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp
index bd37ce2..fcbc1b3 100644
--- a/examples/animation/sub-attaq/graphicsscene.cpp
+++ b/examples/animation/sub-attaq/graphicsscene.cpp
@@ -230,17 +230,17 @@ void GraphicsScene::setupScene(const QList<QAction *> &actions)
     QStateMachine *machine = new QStateMachine(this);
 
     //This state is when the player is playing
-    PlayState *gameState = new PlayState(this,machine->rootState());
+    PlayState *gameState = new PlayState(this,machine);
 
     //Final state
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     //Animation when the player enter in the game
-    QAnimationState *lettersMovingState = new QAnimationState(machine->rootState());
+    QAnimationState *lettersMovingState = new QAnimationState(machine);
     lettersMovingState->setAnimation(lettersGroupMoving);
 
     //Animation when the welcome screen disappear
-    QAnimationState *lettersFadingState = new QAnimationState(machine->rootState());
+    QAnimationState *lettersFadingState = new QAnimationState(machine);
     lettersFadingState->setAnimation(lettersGroupFading);
 
     //if new game then we fade out the welcome screen and start playing
diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp
index 81fd2de..d63737f 100644
--- a/examples/animation/sub-attaq/states.cpp
+++ b/examples/animation/sub-attaq/states.cpp
@@ -83,7 +83,7 @@ void PlayState::onEntry(QEvent *)
     machine = new QStateMachine(this);
 
     //This state is when player is playing
-    LevelState *levelState = new LevelState(scene, this, machine->rootState());
+    LevelState *levelState = new LevelState(scene, this, machine);
 
     //This state is when the player is actually playing but the game is not paused
     QState *playingState = new QState(levelState);
@@ -105,10 +105,10 @@ void PlayState::onEntry(QEvent *)
     pauseState->addTransition(pressPpause);
 
     //This state is when player have lost
-    LostState *lostState = new LostState(scene, this, machine->rootState());
+    LostState *lostState = new LostState(scene, this, machine);
 
     //This state is when player have won
-    WinState *winState = new WinState(scene, this, machine->rootState());
+    WinState *winState = new WinState(scene, this, machine);
 
     //The boat has been destroyed then the game is finished
     levelState->addTransition(scene->boat, SIGNAL(boatExecutionFinished()),lostState);
@@ -136,7 +136,7 @@ void PlayState::onEntry(QEvent *)
     machine->setInitialState(levelState);
 
     //Final state
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     //This transition is triggered when the player press space after completing a level
     CustomSpaceTransition *spaceTransition = new CustomSpaceTransition(scene->views().at(0), this, QEvent::KeyPress, Qt::Key_Space);
diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp
index 04b7916..78a9539 100644
--- a/examples/animation/sub-attaq/submarine.cpp
+++ b/examples/animation/sub-attaq/submarine.cpp
@@ -115,7 +115,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem *
     QStateMachine *machine = new QStateMachine(this);
 
     //This state is when the boat is moving/rotating
-    QState *moving = new QState(machine->rootState());
+    QState *moving = new QState(machine);
 
     //This state is when the boat is moving from left to right
     MovementState *movement = new MovementState(this, moving);
@@ -132,7 +132,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem *
     machine->setInitialState(moving);
 
     //End
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     //If the moving animation is finished we move to the return state
     movement->addTransition(movement, SIGNAL(animationFinished()), rotation);
@@ -141,7 +141,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem *
     rotation->addTransition(rotation, SIGNAL(animationFinished()), movement);
 
     //This state play the destroyed animation
-    QAnimationState *destroyedState = new QAnimationState(machine->rootState());
+    QAnimationState *destroyedState = new QAnimationState(machine);
     destroyedState->setAnimation(setupDestroyAnimation(this));
 
     //Play a nice animation when the submarine is destroyed
diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp
index 5ef237a..fe79488 100644
--- a/examples/animation/sub-attaq/torpedo.cpp
+++ b/examples/animation/sub-attaq/torpedo.cpp
@@ -74,11 +74,11 @@ void Torpedo::launch()
     QStateMachine *machine = new QStateMachine(this);
 
     //This state is when the launch animation is playing
-    QAnimationState *launched = new QAnimationState(machine->rootState());
+    QAnimationState *launched = new QAnimationState(machine);
     launched->setAnimation(launchAnimation);
 
     //End
-    QFinalState *final = new QFinalState(machine->rootState());
+    QFinalState *final = new QFinalState(machine);
 
     machine->setInitialState(launched);
 
diff --git a/examples/examples.pro b/examples/examples.pro
index 5382e28..5855e4f 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -36,6 +36,7 @@ embedded:SUBDIRS += qws
 	contains(QT_BUILD_PARTS, tools):SUBDIRS += qtestlib
 }
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
+contains(QT_CONFIG, openvg): SUBDIRS += openvg
 contains(QT_CONFIG, dbus): SUBDIRS += dbus
 win32: SUBDIRS += activeqt
 contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
diff --git a/examples/mainwindows/application/main.cpp b/examples/mainwindows/application/main.cpp
index f83e709..2fe6d5f 100644
--- a/examples/mainwindows/application/main.cpp
+++ b/examples/mainwindows/application/main.cpp
@@ -49,6 +49,8 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(application);
 
     QApplication app(argc, argv);
+    app.setOrganizationName("Trolltech");
+    app.setApplicationName("Application Example");
     MainWindow mainWin;
     mainWin.show();
     return app.exec();
diff --git a/examples/mainwindows/application/mainwindow.cpp b/examples/mainwindows/application/mainwindow.cpp
index a1eb9b6..16b18b4 100644
--- a/examples/mainwindows/application/mainwindow.cpp
+++ b/examples/mainwindows/application/mainwindow.cpp
@@ -369,13 +369,10 @@ void MainWindow::setCurrentFile(const QString &fileName)
     textEdit->document()->setModified(false);
     setWindowModified(false);
 
-    QString shownName;
+    QString shownName = curFile;
     if (curFile.isEmpty())
         shownName = "untitled.txt";
-    else
-        shownName = strippedName(curFile);
-
-    setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Application")));
+    setWindowFilePath(shownName);
 }
 //! [47]
 
diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp
index 3cb54f1..9ef2cae 100644
--- a/examples/mainwindows/mdi/mainwindow.cpp
+++ b/examples/mainwindows/mdi/mainwindow.cpp
@@ -259,7 +259,6 @@ void MainWindow::createActions()
     connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
 
     closeAct = new QAction(tr("Cl&ose"), this);
-    closeAct->setShortcut(tr("Ctrl+F4"));
     closeAct->setStatusTip(tr("Close the active window"));
     connect(closeAct, SIGNAL(triggered()),
             mdiArea, SLOT(closeActiveSubWindow()));
diff --git a/examples/mainwindows/recentfiles/main.cpp b/examples/mainwindows/recentfiles/main.cpp
index 5417429..1dd3c1b 100644
--- a/examples/mainwindows/recentfiles/main.cpp
+++ b/examples/mainwindows/recentfiles/main.cpp
@@ -46,6 +46,8 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    app.setOrganizationName("Trolltech");
+    app.setApplicationName("Recent Files Example");
     MainWindow *mainWin = new MainWindow;
     mainWin->show();
     return app.exec();
diff --git a/examples/mainwindows/recentfiles/mainwindow.cpp b/examples/mainwindows/recentfiles/mainwindow.cpp
index 1671f53..53d0d0e 100644
--- a/examples/mainwindows/recentfiles/mainwindow.cpp
+++ b/examples/mainwindows/recentfiles/mainwindow.cpp
@@ -54,7 +54,7 @@ MainWindow::MainWindow()
     createMenus();
     (void)statusBar();
 
-    setWindowTitle(tr("Recent Files"));
+    setWindowFilePath(QString());
     resize(400, 300);
 }
 
@@ -209,13 +209,9 @@ void MainWindow::saveFile(const QString &fileName)
 void MainWindow::setCurrentFile(const QString &fileName)
 {
     curFile = fileName;
-    if (curFile.isEmpty())
-        setWindowTitle(tr("Recent Files"));
-    else
-        setWindowTitle(tr("%1 - %2").arg(strippedName(curFile))
-                                    .arg(tr("Recent Files")));
+    setWindowFilePath(curFile);
 
-    QSettings settings("Trolltech", "Recent Files Example");
+    QSettings settings;
     QStringList files = settings.value("recentFileList").toStringList();
     files.removeAll(fileName);
     files.prepend(fileName);
@@ -233,7 +229,7 @@ void MainWindow::setCurrentFile(const QString &fileName)
 
 void MainWindow::updateRecentFileActions()
 {
-    QSettings settings("Trolltech", "Recent Files Example");
+    QSettings settings;
     QStringList files = settings.value("recentFileList").toStringList();
 
     int numRecentFiles = qMin(files.size(), (int)MaxRecentFiles);
diff --git a/examples/mainwindows/sdi/main.cpp b/examples/mainwindows/sdi/main.cpp
index a7e20d8..055d761 100644
--- a/examples/mainwindows/sdi/main.cpp
+++ b/examples/mainwindows/sdi/main.cpp
@@ -47,6 +47,8 @@ int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(sdi);
     QApplication app(argc, argv);
+    app.setApplicationName("SDI Example");
+    app.setOrganizationName("Trolltech");
     MainWindow *mainWin = new MainWindow;
     mainWin->show();
     return app.exec();
diff --git a/examples/mainwindows/sdi/mainwindow.cpp b/examples/mainwindows/sdi/mainwindow.cpp
index 8710105..1e7f2c0 100644
--- a/examples/mainwindows/sdi/mainwindow.cpp
+++ b/examples/mainwindows/sdi/mainwindow.cpp
@@ -266,7 +266,7 @@ void MainWindow::createStatusBar()
 
 void MainWindow::readSettings()
 {
-    QSettings settings("Trolltech", "SDI Example");
+    QSettings settings;
     QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
     QSize size = settings.value("size", QSize(400, 400)).toSize();
     move(pos);
@@ -275,7 +275,7 @@ void MainWindow::readSettings()
 
 void MainWindow::writeSettings()
 {
-    QSettings settings("Trolltech", "SDI Example");
+    QSettings settings;
     settings.setValue("pos", pos());
     settings.setValue("size", size());
 }
@@ -352,9 +352,7 @@ void MainWindow::setCurrentFile(const QString &fileName)
 
     textEdit->document()->setModified(false);
     setWindowModified(false);
-
-    setWindowTitle(tr("%1[*] - %2").arg(strippedName(curFile))
-                                       .arg(tr("SDI")));
+    setWindowFilePath(curFile);
 }
 
 QString MainWindow::strippedName(const QString &fullFileName)
diff --git a/examples/openvg/README b/examples/openvg/README
new file mode 100644
index 0000000..5e385ea
--- /dev/null
+++ b/examples/openvg/README
@@ -0,0 +1,40 @@
+Qt provides support for integration with OpenVG implementations on
+platforms with appropriate hardware acceleration.
+
+These examples demonstrate the basic techniques used to take advantage of
+OpenVG in Qt applications.  In particular, the "star" example shows how
+to mix QPainter and OpenVG calls in the same paint event.
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory.
+
+Documentation for these examples can be found via the Tutorial and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/openvg/openvg.pro b/examples/openvg/openvg.pro
new file mode 100644
index 0000000..d76a389
--- /dev/null
+++ b/examples/openvg/openvg.pro
@@ -0,0 +1,8 @@
+TEMPLATE      = subdirs
+SUBDIRS       = star
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/openvg
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS openvg.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/openvg
+INSTALLS += target sources
diff --git a/examples/animation/stickman/editor/mainwindow.h b/examples/openvg/star/main.cpp
index ef122d9..eec2186 100644
--- a/examples/animation/stickman/editor/mainwindow.h
+++ b/examples/openvg/star/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,20 +39,16 @@
 **
 ****************************************************************************/
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#include <QApplication>
+#include "starwidget.h"
 
-#include <QMainWindow>
-
-class StickMan;
-class MainWindow: public QMainWindow
+int main(int argc, char *argv[])
 {
-public:
-    MainWindow(StickMan *stickMan);
-    ~MainWindow();
-
-private:
-    void initActions(StickMan *stickMan);
-};
-
+#ifdef Q_OS_SYMBIAN
+    QApplication::setGraphicsSystem("openvg");
 #endif
+    QApplication app(argc, argv);
+    StarWidget mw;
+    mw.show();
+    return app.exec();
+}
diff --git a/examples/openvg/star/star.pro b/examples/openvg/star/star.pro
new file mode 100644
index 0000000..90c236d
--- /dev/null
+++ b/examples/openvg/star/star.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+TARGET = star
+CONFIG += qt debug warn_on
+QT += openvg
+SOURCES = starwidget.cpp main.cpp
+HEADERS = starwidget.h
diff --git a/examples/openvg/star/starwidget.cpp b/examples/openvg/star/starwidget.cpp
new file mode 100644
index 0000000..9d2a255
--- /dev/null
+++ b/examples/openvg/star/starwidget.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtOpenGL 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 http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "starwidget.h"
+
+StarWidget::StarWidget(QWidget *parent)
+    : QWidget(parent)
+    , path(VG_INVALID_HANDLE)
+    , pen(Qt::red, 4.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)
+    , brush(Qt::yellow)
+{
+    setMinimumSize(220, 250);
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+}
+
+static VGubyte const starSegments[] = {
+    VG_MOVE_TO_ABS,
+    VG_LINE_TO_REL,
+    VG_LINE_TO_REL,
+    VG_LINE_TO_REL,
+    VG_LINE_TO_REL,
+    VG_CLOSE_PATH
+};
+static VGfloat const starCoords[] = {
+    110, 35,
+    50, 160,
+    -130, -100,
+    160, 0,
+    -130, 100
+};
+
+void StarWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter;
+    painter.begin(this);
+
+    // Make sure that we are using the OpenVG paint engine.
+    if (painter.paintEngine()->type() != QPaintEngine::OpenVG) {
+#ifdef Q_WS_QWS
+        qWarning("Not using OpenVG: use the '-display' option to specify an OpenVG driver");
+#else
+        qWarning("Not using OpenVG: specify '-graphicssystem OpenVG'");
+#endif
+        return;
+    }
+
+    // Select a pen and a brush for drawing the star.
+    painter.setPen(pen);
+    painter.setBrush(brush);
+
+    // We want the star border to be anti-aliased.
+    painter.setRenderHints(QPainter::Antialiasing);
+
+    // Flush the state changes to the OpenVG implementation
+    // and prepare to perform raw OpenVG calls.
+    painter.paintEngine()->syncState();
+
+    // Cache the path if we haven't already.
+    if (path == VG_INVALID_HANDLE) {
+        path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
+                            VG_PATH_DATATYPE_F,
+                            1.0f, // scale
+                            0.0f, // bias
+                            6,    // segmentCapacityHint
+                            10,   // coordCapacityHint
+                            VG_PATH_CAPABILITY_ALL);
+        vgAppendPathData(path, sizeof(starSegments), starSegments, starCoords);
+    }
+
+    // Draw the star directly using the OpenVG API.
+    vgDrawPath(path, VG_FILL_PATH | VG_STROKE_PATH);
+
+    // Restore normal QPainter operations.
+    painter.paintEngine()->syncState();
+
+    painter.end();
+}
diff --git a/examples/statemachine/tankgame/gameovertransition.h b/examples/openvg/star/starwidget.h
index e918359..883f8c4 100644
--- a/examples/statemachine/tankgame/gameovertransition.h
+++ b/examples/openvg/star/starwidget.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,25 +39,28 @@
 **
 ****************************************************************************/
 
-#ifndef GAMEOVERTRANSITION_H
-#define GAMEOVERTRANSITION_H
+#ifndef STARWIDGET_H
+#define STARWIDGET_H
 
-#include <QSignalTransition>
+#include <QWidget>
+#include <QPainter>
+#include <QPaintEngine>
+#include "qvg.h"
 
-class TankItem;
-class GameOverTransition: public QSignalTransition
+class StarWidget : public QWidget
 {
     Q_OBJECT
 public:
-    GameOverTransition(QAbstractState *targetState);
-
-    void addTankItem(TankItem *tankItem);
+    StarWidget(QWidget *parent = 0);
+    ~StarWidget() {}
 
 protected:
-    bool eventTest(QEvent *event);
+    void paintEvent(QPaintEvent *);
 
 private:
-    QList<TankItem *> m_tankItems;
+    VGPath path;
+    QPen pen;
+    QBrush brush;
 };
 
 #endif
diff --git a/examples/statemachine/factorial/main.cpp b/examples/statemachine/factorial/main.cpp
index 18a9521..5050347 100644
--- a/examples/statemachine/factorial/main.cpp
+++ b/examples/statemachine/factorial/main.cpp
@@ -151,14 +151,14 @@ int main(int argc, char **argv)
 //! [3]
 
 //! [4]
-    QState *compute = new QState(machine.rootState());
+    QState *compute = new QState(&machine);
     compute->assignProperty(&factorial, "fac", 1);
     compute->assignProperty(&factorial, "x", 6);
     compute->addTransition(new FactorialLoopTransition(&factorial));
 //! [4]
 
 //! [5]
-    QFinalState *done = new QFinalState(machine.rootState());
+    QFinalState *done = new QFinalState(&machine);
     FactorialDoneTransition *doneTransition = new FactorialDoneTransition(&factorial);
     doneTransition->setTargetState(done);
     compute->addTransition(doneTransition);
diff --git a/examples/statemachine/statemachine.pro b/examples/statemachine/statemachine.pro
index 5074a3c..ea3e7a8 100644
--- a/examples/statemachine/statemachine.pro
+++ b/examples/statemachine/statemachine.pro
@@ -4,9 +4,7 @@ SUBDIRS       = \
                 factorial \
                 pingpong \
                 trafficlight \
-                twowaybutton \
-                tankgame \
-                tankgameplugins
+                twowaybutton
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/statemachine
diff --git a/examples/statemachine/tankgame/gameitem.cpp b/examples/statemachine/tankgame/gameitem.cpp
deleted file mode 100644
index 94affb4..0000000
--- a/examples/statemachine/tankgame/gameitem.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "gameitem.h"
-
-#include <QGraphicsScene>
-#include <QDebug>
-
-GameItem::GameItem(QObject *parent) : QObject(parent)
-{
-}
-
-QPointF GameItem::tryMove(const QPointF &requestedPosition, QLineF *collidedLine, 
-                          QGraphicsItem **collidedItem) const
-{
-    QLineF movementPath(pos(), requestedPosition);    
-
-    qreal cannonLength = 0.0;
-    {
-        QPointF p1 = boundingRect().center();
-        QPointF p2 = QPointF(boundingRect().right() + 10.0, p1.y());
-
-        cannonLength = QLineF(mapToScene(p1), mapToScene(p2)).length();
-    }
-
-    movementPath.setLength(movementPath.length() + cannonLength);
-
-    QRectF boundingRectPath(QPointF(qMin(movementPath.x1(), movementPath.x2()), qMin(movementPath.y1(), movementPath.y2())),
-                            QPointF(qMax(movementPath.x1(), movementPath.x2()), qMax(movementPath.y1(), movementPath.y2())));
-
-    QList<QGraphicsItem *> itemsInRect = scene()->items(boundingRectPath, Qt::IntersectsItemBoundingRect);
-
-    QPointF nextPoint = requestedPosition;
-    QRectF sceneRect = scene()->sceneRect();
-
-    foreach (QGraphicsItem *item, itemsInRect) {
-        if (item == static_cast<const QGraphicsItem *>(this))
-            continue; 
-
-        QPolygonF mappedBoundingRect = item->mapToScene(item->boundingRect());
-        for (int i=0; i<mappedBoundingRect.size(); ++i) {
-            QPointF p1 = mappedBoundingRect.at(i == 0 ? mappedBoundingRect.size()-1 : i-1);
-            QPointF p2 = mappedBoundingRect.at(i);
-
-            QLineF rectLine(p1, p2);
-            QPointF intersectionPoint;
-            QLineF::IntersectType intersectType = movementPath.intersect(rectLine, &intersectionPoint);
-
-            if (intersectType == QLineF::BoundedIntersection) {
-                movementPath.setP2(intersectionPoint);
-                movementPath.setLength(movementPath.length() - cannonLength);
-                nextPoint = movementPath.p2();
-
-                if (collidedLine != 0)
-                    *collidedLine = rectLine;
-
-                if (collidedItem != 0)
-                    *collidedItem = item;
-            }
-        }
-    }
-
-
-    // Don't go outside of map
-    if (nextPoint.x() < sceneRect.left()) {
-        nextPoint.rx() = sceneRect.left();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topLeft(), scene()->sceneRect().bottomLeft());
-    }
-    
-    if (nextPoint.x() > sceneRect.right()) {
-        nextPoint.rx() = sceneRect.right();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topRight(), scene()->sceneRect().bottomRight());        
-    }
-    
-    if (nextPoint.y() < sceneRect.top()) {
-        nextPoint.ry() = sceneRect.top();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().topLeft(), scene()->sceneRect().topRight());
-    }
-    
-    if (nextPoint.y() > sceneRect.bottom()) {
-        nextPoint.ry() = sceneRect.bottom();
-        if (collidedLine != 0)
-            *collidedLine = QLineF(scene()->sceneRect().bottomLeft(), scene()->sceneRect().bottomRight());
-    }
-
-    return nextPoint;
-}
-
diff --git a/examples/statemachine/tankgame/gameitem.h b/examples/statemachine/tankgame/gameitem.h
deleted file mode 100644
index af012bb..0000000
--- a/examples/statemachine/tankgame/gameitem.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GAMEITEM_H
-#define GAMEITEM_H
-
-#include <QGraphicsItem>
-
-QT_BEGIN_NAMESPACE
-class QLineF;
-QT_END_NAMESPACE
-class GameItem: public QObject, public QGraphicsItem
-{
-    Q_OBJECT
-public:
-    enum { Type = UserType + 1 };
-    int type() const { return Type; }
-
-    GameItem(QObject *parent = 0);
-
-    virtual void idle(qreal elapsed) = 0;
-
-protected:
-    QPointF tryMove(const QPointF &requestedPosition, QLineF *collidedLine = 0, 
-        QGraphicsItem **collidedItem = 0) const;
-};
-
-#endif
diff --git a/examples/statemachine/tankgame/gameovertransition.cpp b/examples/statemachine/tankgame/gameovertransition.cpp
deleted file mode 100644
index 634fbce..0000000
--- a/examples/statemachine/tankgame/gameovertransition.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "gameovertransition.h"
-#include "tankitem.h"
-
-#include <QSignalEvent>
-#include <QSignalMapper>
-
-GameOverTransition::GameOverTransition(QAbstractState *targetState)
-    : QSignalTransition(new QSignalMapper(), SIGNAL(mapped(QObject*)))
-{
-    setTargetState(targetState);
-
-    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
-    mapper->setParent(this);
-}
-
-void GameOverTransition::addTankItem(TankItem *tankItem)
-{
-    m_tankItems.append(tankItem);
-
-    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
-    mapper->setMapping(tankItem, tankItem);
-    connect(tankItem, SIGNAL(aboutToBeDestroyed()), mapper, SLOT(map()));
-}
-
-bool GameOverTransition::eventTest(QEvent *e)
-{
-    bool ret = QSignalTransition::eventTest(e);
-
-    if (ret) {
-        QSignalEvent *signalEvent = static_cast<QSignalEvent *>(e);
-        QObject *sender = qvariant_cast<QObject *>(signalEvent->arguments().at(0));
-        TankItem *tankItem = qobject_cast<TankItem *>(sender);
-        m_tankItems.removeAll(tankItem);
-
-        return m_tankItems.size() <= 1;
-    } else {
-        return false;
-    }
-}
diff --git a/examples/statemachine/tankgame/mainwindow.cpp b/examples/statemachine/tankgame/mainwindow.cpp
deleted file mode 100644
index 68a8d68..0000000
--- a/examples/statemachine/tankgame/mainwindow.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-#include "tankitem.h"
-#include "rocketitem.h"
-#include "plugin.h"
-#include "gameovertransition.h"
-
-#include <QStateMachine>
-#include <QGraphicsView>
-#include <QAction>
-#include <QMenuBar>
-#include <QState>
-#include <QHistoryState>
-#include <QTimer>
-#include <QFileDialog>
-#include <QPluginLoader>
-#include <QApplication>
-#include <QInputDialog>
-#include <QMessageBox>
-
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent), m_scene(0), m_machine(0), m_runningState(0), m_started(false)
-{
-    init();
-}
-
-MainWindow::~MainWindow()
-{
-}
-
-void MainWindow::addWall(const QRectF &wall)
-{
-    QGraphicsRectItem *item = new QGraphicsRectItem;
-    item->setRect(wall);
-    item->setBrush(Qt::darkGreen);
-    item->setPen(QPen(Qt::black, 0));
-
-    m_scene->addItem(item);
-}
-
-void MainWindow::init()
-{
-    setWindowTitle("Pluggable Tank Game");
-
-    QGraphicsView *view = new QGraphicsView(this);
-    view->setRenderHints(QPainter::Antialiasing);
-    setCentralWidget(view);
-
-    m_scene = new QGraphicsScene(this);
-    view->setScene(m_scene);
-
-    QRectF sceneRect = QRectF(-200.0, -200.0, 400.0, 400.0);
-    m_scene->setSceneRect(sceneRect);
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().topLeft() + QPointF(30.0, 30.0));
-        item->setDirection(45.0);
-        item->setColor(Qt::red);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().topRight() + QPointF(-30.0, 30.0));
-        item->setDirection(135.0);
-        item->setColor(Qt::green);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().bottomRight() + QPointF(-30.0, -30.0));
-        item->setDirection(225.0);
-        item->setColor(Qt::blue);
-
-        m_spawns.append(item);
-    }
-
-    {
-        TankItem *item = new TankItem(this);
-
-        item->setPos(m_scene->sceneRect().bottomLeft() + QPointF(30.0, -30.0));
-        item->setDirection(315.0);
-        item->setColor(Qt::yellow);
-
-        m_spawns.append(item);
-    }
-
-    QPointF centerOfMap = sceneRect.center();
-
-    addWall(QRectF(centerOfMap + QPointF(-50.0, -60.0), centerOfMap + QPointF(50.0, -50.0)));
-    addWall(QRectF(centerOfMap - QPointF(-50.0, -60.0), centerOfMap - QPointF(50.0, -50.0)));
-    addWall(QRectF(centerOfMap + QPointF(-50.0, -50.0), centerOfMap + QPointF(-40.0, 50.0)));
-    addWall(QRectF(centerOfMap - QPointF(-50.0, -50.0), centerOfMap - QPointF(-40.0, 50.0)));
-
-    addWall(QRectF(sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, -10.0),
-                   sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, 100.0)));
-    addWall(QRectF(sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, 10.0),
-                   sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, -100.0)));
-    addWall(QRectF(sceneRect.topLeft() + QPointF(-10.0, sceneRect.height() / 2.0 - 5.0),
-                   sceneRect.topLeft() + QPointF(100.0, sceneRect.height() / 2.0 + 5.0)));
-    addWall(QRectF(sceneRect.topRight() + QPointF(10.0, sceneRect.height() / 2.0 - 5.0),
-                   sceneRect.topRight() + QPointF(-100.0, sceneRect.height() / 2.0 + 5.0)));
-
-
-    QAction *addTankAction = menuBar()->addAction("&Add tank");
-    QAction *runGameAction = menuBar()->addAction("&Run game");
-    runGameAction->setObjectName("runGameAction");
-    QAction *stopGameAction = menuBar()->addAction("&Stop game");
-    menuBar()->addSeparator();
-    QAction *quitAction = menuBar()->addAction("&Quit");
-
-    connect(addTankAction, SIGNAL(triggered()), this, SLOT(addTank()));
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-
-    m_machine = new QStateMachine(this);
-    QState *stoppedState = new QState(m_machine->rootState());
-    stoppedState->setObjectName("stoppedState");
-    stoppedState->assignProperty(runGameAction, "enabled", true);
-    stoppedState->assignProperty(stopGameAction, "enabled", false);
-    stoppedState->assignProperty(this, "started", false);
-    m_machine->setInitialState(stoppedState);
-
-//! [5]
-    QState *spawnsAvailable = new QState(stoppedState);
-    spawnsAvailable->assignProperty(addTankAction, "enabled", true);
-
-    QState *noSpawnsAvailable = new QState(stoppedState);
-    noSpawnsAvailable->assignProperty(addTankAction, "enabled", false);
-//! [5]
-    spawnsAvailable->setObjectName("spawnsAvailable");
-    noSpawnsAvailable->setObjectName("noSpawnsAvailable");
-
-    spawnsAvailable->addTransition(this, SIGNAL(mapFull()), noSpawnsAvailable);
-
-//! [3]
-    QHistoryState *hs = new QHistoryState(stoppedState);
-    hs->setDefaultState(spawnsAvailable);
-//! [3]
-    hs->setObjectName("hs");
-
-    stoppedState->setInitialState(hs);
-
-//! [0]
-    m_runningState = new QState(QState::ParallelStates, m_machine->rootState());
-//! [0]
-    m_runningState->setObjectName("runningState");
-    m_runningState->assignProperty(addTankAction, "enabled", false);
-    m_runningState->assignProperty(runGameAction, "enabled", false);
-    m_runningState->assignProperty(stopGameAction, "enabled", true);
-
-    QState *gameOverState = new QState(m_machine->rootState());
-    gameOverState->setObjectName("gameOverState");
-    gameOverState->assignProperty(stopGameAction, "enabled", false);
-    connect(gameOverState, SIGNAL(entered()), this, SLOT(gameOver()));
-
-    stoppedState->addTransition(runGameAction, SIGNAL(triggered()), m_runningState);
-    m_runningState->addTransition(stopGameAction, SIGNAL(triggered()), stoppedState);
-
-    m_gameOverTransition = new GameOverTransition(gameOverState);
-    m_runningState->addTransition(m_gameOverTransition);
-
-    QTimer *timer = new QTimer(this);
-    timer->setInterval(100);
-    connect(timer, SIGNAL(timeout()), this, SLOT(runStep()));
-    connect(m_runningState, SIGNAL(entered()), timer, SLOT(start()));
-    connect(m_runningState, SIGNAL(exited()), timer, SLOT(stop()));
-
-    m_machine->start();
-    m_time.start();
-}
-
-void MainWindow::runStep()
-{
-    if (!m_started) {
-        m_time.restart();
-        m_started = true;
-    } else {
-        int elapsed = m_time.elapsed();
-        if (elapsed > 0) {
-            m_time.restart();
-            qreal elapsedSecs = elapsed / 1000.0;
-            QList<QGraphicsItem *> items = m_scene->items();
-            foreach (QGraphicsItem *item, items) {
-                if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(item))
-                    gameItem->idle(elapsedSecs);
-            }
-        }
-    }
-}
-
-void MainWindow::gameOver()
-{
-    QList<QGraphicsItem *> items = m_scene->items();
-
-    TankItem *lastTankStanding = 0;
-    foreach (QGraphicsItem *item, items) {
-        if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(item)) {
-            if ((lastTankStanding = qobject_cast<TankItem *>(gameItem)) != 0)
-                break;
-        }
-    }
-
-    QMessageBox::information(this, "Game over!",
-        QString::fromLatin1("The tank played by '%1' has won!").arg(lastTankStanding->objectName()));
-}
-
-void MainWindow::addRocket()
-{
-    TankItem *tankItem = qobject_cast<TankItem *>(sender());
-    if (tankItem != 0) {
-        RocketItem *rocketItem = new RocketItem;
-
-        QPointF s = tankItem->mapToScene(QPointF(tankItem->boundingRect().right() + 10.0,
-                                                 tankItem->boundingRect().center().y()));
-        rocketItem->setPos(s);
-        rocketItem->setDirection(tankItem->direction());
-        m_scene->addItem(rocketItem);
-    }
-}
-
-void MainWindow::addTank()
-{
-    Q_ASSERT(!m_spawns.isEmpty());
-
-    QDir pluginsDir(qApp->applicationDirPath());
-#if defined(Q_OS_WIN)
-    if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release")
-        pluginsDir.cdUp();
-#elif defined(Q_OS_MAC)
-    if (pluginsDir.dirName() == "MacOS") {
-        pluginsDir.cdUp();
-        pluginsDir.cdUp();
-        pluginsDir.cdUp();
-    }
-#endif
-
-    pluginsDir.cd("plugins");
-
-    QStringList itemNames;
-    QList<Plugin *> items;
-    foreach (QString fileName, pluginsDir.entryList(QDir::Files)) {
-        QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
-        QObject *possiblePlugin = loader.instance();
-        if (Plugin *plugin = qobject_cast<Plugin *>(possiblePlugin)) {
-            QString objectName = possiblePlugin->objectName();
-            if (objectName.isEmpty())
-                objectName = fileName;
-
-            itemNames.append(objectName);
-            items.append(plugin);
-        }
-    }
-
-    if (items.isEmpty()) {
-        QMessageBox::information(this, "No tank types found", "Please build the errorstateplugins directory");
-        return;
-    }
-
-    bool ok;
-//! [1]
-    QString selectedName = QInputDialog::getItem(this, "Select a tank type", "Tank types",
-        itemNames, 0, false, &ok);
-//! [1]
-
-    if (ok && !selectedName.isEmpty()) {
-        int idx = itemNames.indexOf(selectedName);
-        if (Plugin *plugin = idx >= 0 ? items.at(idx) : 0) {
-            TankItem *tankItem = m_spawns.takeLast();
-            tankItem->setObjectName(selectedName);
-            tankItem->setToolTip(selectedName);
-            m_scene->addItem(tankItem);
-            connect(tankItem, SIGNAL(cannonFired()), this, SLOT(addRocket()));
-            if (m_spawns.isEmpty())
-                emit mapFull();
-
-            m_gameOverTransition->addTankItem(tankItem);
-
-            QState *region = new QState(m_runningState);
-            region->setObjectName(QString::fromLatin1("region%1").arg(m_spawns.size()));
-//! [2]
-            QState *pluginState = plugin->create(region, tankItem);
-//! [2]
-            region->setInitialState(pluginState);
-
-            // If the plugin has an error it is disabled
-//! [4]
-            QState *errorState = new QState(region);
-            errorState->setObjectName(QString::fromLatin1("errorState%1").arg(m_spawns.size()));
-            errorState->assignProperty(tankItem, "enabled", false);
-            pluginState->setErrorState(errorState);
-//! [4]
-        }
-    }
-}
-
diff --git a/examples/statemachine/tankgame/mainwindow.h b/examples/statemachine/tankgame/mainwindow.h
deleted file mode 100644
index d42b7ac..0000000
--- a/examples/statemachine/tankgame/mainwindow.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QTime>
-
-QT_BEGIN_NAMESPACE
-class QGraphicsScene;
-class QStateMachine;
-class QState;
-QT_END_NAMESPACE
-class GameOverTransition;
-class TankItem;
-
-class MainWindow: public QMainWindow
-{
-    Q_OBJECT
-    Q_PROPERTY(bool started READ started WRITE setStarted)
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-    void setStarted(bool b) { m_started = b; }
-    bool started() const { return m_started; }
-
-public slots:
-    void addTank();
-    void addRocket();
-    void runStep();
-    void gameOver();
-
-signals:
-    void mapFull();
-
-private:
-    void init();
-    void addWall(const QRectF &wall);
-
-    QGraphicsScene *m_scene;
-
-    QStateMachine *m_machine;
-    QState *m_runningState;
-    GameOverTransition *m_gameOverTransition;
-
-    QList<TankItem *> m_spawns;
-    QTime m_time;
-
-    bool m_started : 1;
-};
-
-#endif
-
diff --git a/examples/statemachine/tankgame/rocketitem.cpp b/examples/statemachine/tankgame/rocketitem.cpp
deleted file mode 100644
index d286e5d..0000000
--- a/examples/statemachine/tankgame/rocketitem.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "rocketitem.h"
-#include "tankitem.h"
-
-#include <QPainter>
-#include <QGraphicsScene>
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-RocketItem::RocketItem(QObject *parent)
-    : GameItem(parent), m_direction(0.0), m_distance(300.0)
-{
-}
-
-QRectF RocketItem::boundingRect() const
-{
-    return QRectF(-1.0, -1.0, 2.0, 2.0);
-}
-
-void RocketItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    painter->setBrush(Qt::black);
-    painter->drawEllipse(boundingRect());
-}
-
-void RocketItem::idle(qreal elapsed)
-{
-    qreal dist = elapsed * speed();
-
-    m_distance -= dist;
-    if (m_distance < 0.0) {
-        scene()->removeItem(this);
-        delete this;
-        return;
-    }
-
-    qreal a = m_direction * M_PI / 180.0;
-
-    qreal yd = dist * sin(a);
-    qreal xd = dist * sin(M_PI / 2.0 - a);
-
-    QPointF requestedPosition = pos() + QPointF(xd, yd);
-    QGraphicsItem *collidedItem = 0;
-    QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem);
-    if (requestedPosition == nextPosition) {
-        setPos(nextPosition);
-    } else {
-        if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(collidedItem)) {
-            TankItem *tankItem = qobject_cast<TankItem *>(gameItem);
-            if (tankItem != 0)
-                tankItem->hitByRocket();
-        }
-
-        scene()->removeItem(this);
-        delete this;
-    }
-}
diff --git a/examples/statemachine/tankgame/rocketitem.h b/examples/statemachine/tankgame/rocketitem.h
deleted file mode 100644
index a485d03..0000000
--- a/examples/statemachine/tankgame/rocketitem.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ROCKETITEM_H
-#define ROCKETITEM_H
-
-#include "gameitem.h"
-
-class RocketItem: public GameItem
-{
-    Q_OBJECT
-public:
-    RocketItem(QObject *parent = 0);
-
-    virtual void idle(qreal elapsed);
-    qreal speed() const { return 100.0; }
-    void setDirection(qreal direction) { m_direction = direction; }
-
-protected:
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    QRectF boundingRect() const;
-
-private:
-    qreal m_direction;
-    qreal m_distance;
-};
-
-#endif
diff --git a/examples/statemachine/tankgame/tankgame.pro b/examples/statemachine/tankgame/tankgame.pro
deleted file mode 100644
index 59415be..0000000
--- a/examples/statemachine/tankgame/tankgame.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-HEADERS += mainwindow.h \
-           plugin.h \
-           tankitem.h \
-           rocketitem.h \
-           gameitem.h \
-           gameovertransition.h
-SOURCES += main.cpp \
-           mainwindow.cpp \
-           tankitem.cpp \
-           rocketitem.cpp \
-           gameitem.cpp \
-           gameovertransition.cpp
-CONFIG += console
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgame.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame
-INSTALLS += target sources
diff --git a/examples/statemachine/tankgame/tankitem.cpp b/examples/statemachine/tankgame/tankitem.cpp
deleted file mode 100644
index 192b272..0000000
--- a/examples/statemachine/tankgame/tankitem.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "tankitem.h"
-
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QDebug>
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-class Action
-{
-public:
-    Action(TankItem *item) : m_item(item)
-    {
-    }
-
-    TankItem *item() const { return m_item; }
-    void setItem(TankItem *item) { m_item = item; }
-
-    virtual bool apply(qreal timeDelta) = 0;
-
-private:
-    TankItem *m_item;
-};
-
-class MoveAction: public Action
-{
-public:
-    MoveAction(TankItem *item, qreal distance)
-        : Action(item), m_distance(distance)
-    {
-        m_reverse = m_distance < 0.0;
-    }
-
-    bool apply(qreal timeDelta)
-    {
-        qreal dist = timeDelta * item()->speed() * (m_reverse ? -1.0 : 1.0);
-
-        bool done = false;
-        if (qAbs(m_distance) < qAbs(dist)) {
-            done = true;
-            dist = m_distance;
-        }
-        m_distance -= dist;
-
-        qreal a = item()->direction() * M_PI / 180.0;
-
-        qreal yd = dist * sin(a);
-        qreal xd = dist * sin(M_PI / 2.0 - a);
-
-        item()->setPos(item()->pos() + QPointF(xd, yd));
-        return !done;
-    }
-
-private:
-    qreal m_distance;
-    bool m_reverse;
-};
-
-class TurnAction: public Action
-{
-public:
-    TurnAction(TankItem *item, qreal distance)
-        : Action(item), m_distance(distance)
-    {
-        m_reverse = m_distance < 0.0;
-    }
-
-    bool apply(qreal timeDelta)
-    {
-        qreal dist = timeDelta * item()->angularSpeed() * (m_reverse ? -1.0 : 1.0);
-        bool done = false;
-        if (qAbs(m_distance) < qAbs(dist)) {
-            done = true;
-            dist = m_distance;
-        }
-        m_distance -= dist;
-
-        item()->setDirection(item()->direction() + dist);
-        return !done;
-    }
-
-private:
-    qreal m_distance;
-    bool m_reverse;
-};
-
-TankItem::TankItem(QObject *parent)
-    : GameItem(parent), m_currentAction(0), m_currentDirection(0.0), m_enabled(true)
-{
-    connect(this, SIGNAL(cannonFired()), this, SIGNAL(actionCompleted()));
-}
-
-void TankItem::idle(qreal elapsed)
-{
-    if (m_enabled) {
-        if (m_currentAction != 0) {
-            if (!m_currentAction->apply(elapsed)) {
-                setAction(0);
-                emit actionCompleted();
-            }
-
-            QGraphicsItem *item = 0;
-            qreal distance = distanceToObstacle(&item);
-            if (TankItem *tankItem = qgraphicsitem_cast<TankItem *>(item))
-                emit tankSpotted(tankItem->direction(), distance);
-        }
-    }
-}
-
-void TankItem::hitByRocket()
-{
-    emit aboutToBeDestroyed();
-    deleteLater();
-}
-
-void TankItem::setAction(Action *newAction)
-{
-    if (m_currentAction != 0)
-        delete m_currentAction;
-
-    m_currentAction = newAction;
-}
-
-void TankItem::fireCannon()
-{
-    emit cannonFired();
-}
-
-void TankItem::moveForwards(qreal length)
-{
-    setAction(new MoveAction(this, length));
-}
-
-void TankItem::moveBackwards(qreal length)
-{
-    setAction(new MoveAction(this, -length));
-}
-
-void TankItem::turn(qreal degrees)
-{
-    setAction(new TurnAction(this, degrees));
-}
-
-void TankItem::turnTo(qreal degrees)
-{
-    setAction(new TurnAction(this, degrees - direction()));
-}
-
-void TankItem::stop()
-{
-    setAction(0);
-}
-
-QVariant TankItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
-{
-    if (change == ItemPositionChange && scene()) {
-        QPointF requestedPosition = value.toPointF();
-        QLineF collidedLine;
-        QPointF nextPoint = tryMove(requestedPosition, &collidedLine);
-        if (nextPoint != requestedPosition)
-            emit collision(collidedLine);
-        return nextPoint;
-    } else {
-        return QGraphicsItem::itemChange(change, value);
-    }
-}
-
-
-void TankItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    QRectF brect = boundingRect();
-
-    painter->setBrush(m_color);
-    painter->setPen(Qt::black);
-
-    // body
-    painter->drawRect(brect.adjusted(0.0, 4.0, -2.0, -4.0));
-
-    // cannon
-    QRectF cannonBase = brect.adjusted(10.0, 6.0, -12.0, -6.0);
-    painter->drawEllipse(cannonBase);
-
-    painter->drawRect(QRectF(QPointF(cannonBase.center().x(), cannonBase.center().y() - 2.0),
-                             QPointF(brect.right(), cannonBase.center().y() + 2.0)));
-
-    // left track
-    painter->setBrush(QBrush(Qt::black, Qt::VerPattern));
-    QRectF leftTrackRect = QRectF(brect.topLeft(), QPointF(brect.right() - 2.0, brect.top() + 4.0));
-    painter->fillRect(leftTrackRect, Qt::darkYellow);
-    painter->drawRect(leftTrackRect);
-
-    // right track
-    QRectF rightTrackRect = QRectF(QPointF(brect.left(), brect.bottom() - 4.0),
-                                   QPointF(brect.right() - 2.0, brect.bottom()));
-    painter->fillRect(rightTrackRect, Qt::darkYellow);
-    painter->drawRect(rightTrackRect);
-
-    if (!m_enabled) {
-        painter->setPen(QPen(Qt::red, 5));
-
-        painter->drawEllipse(brect);
-
-        QPainterPath path;
-        path.addEllipse(brect);
-        painter->setClipPath(path);
-        painter->drawLine(brect.topRight(), brect.bottomLeft());
-    }
-}
-
-QRectF TankItem::boundingRect() const
-{
-    return QRectF(-20.0, -10.0, 40.0, 20.0);
-}
-
-qreal TankItem::direction() const
-{
-    return m_currentDirection;
-}
-
-void TankItem::setDirection(qreal newDirection)
-{
-    int fullRotations = int(newDirection) / 360;
-    newDirection -= fullRotations * 360.0;
-
-    qreal diff = newDirection - m_currentDirection;
-    m_currentDirection = newDirection;
-    rotate(diff);
-}
-
-qreal TankItem::distanceToObstacle(QGraphicsItem **obstacle) const
-{
-    qreal dist = sqrt(pow(scene()->sceneRect().width(), 2) + pow(scene()->sceneRect().height(), 2));
-
-    qreal a = m_currentDirection * M_PI / 180.0;
-
-    qreal yd = dist * sin(a);
-    qreal xd = dist * sin(M_PI / 2.0 - a);
-
-    QPointF requestedPosition = pos() + QPointF(xd, yd);
-    QGraphicsItem *collidedItem = 0;
-    QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem);
-    if (collidedItem != 0) {
-        if (obstacle != 0)
-            *obstacle = collidedItem;
-
-        QPointF d = nextPosition - pos();
-        return sqrt(pow(d.x(), 2) + pow(d.y(), 2));
-    } else {
-        return 0.0;
-    }
-}
-
-qreal TankItem::distanceToObstacle() const
-{
-    return distanceToObstacle(0);
-}
-
diff --git a/examples/statemachine/tankgame/tankitem.h b/examples/statemachine/tankgame/tankitem.h
deleted file mode 100644
index a2f72de..0000000
--- a/examples/statemachine/tankgame/tankitem.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef TANKITEM_H
-#define TANKITEM_H
-
-#include "gameitem.h"
-
-#include <QColor>
-
-class Action;
-class TankItem: public GameItem
-{
-    Q_OBJECT
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
-    Q_PROPERTY(qreal direction READ direction WRITE turnTo)
-    Q_PROPERTY(qreal distanceToObstacle READ distanceToObstacle)
-public:
-    TankItem(QObject *parent = 0);
-
-    void setColor(const QColor &color) { m_color = color; }
-    QColor color() const { return m_color; }
-
-    void idle(qreal elapsed);
-    void setDirection(qreal newDirection);
-
-    qreal speed() const { return 90.0; }
-    qreal angularSpeed() const { return 90.0; }
-
-    QRectF boundingRect() const;
-
-    void hitByRocket();
-
-    void setEnabled(bool b) { m_enabled = b; }
-    bool enabled() const { return m_enabled; }
-
-    qreal direction() const;
-    qreal distanceToObstacle() const;
-    qreal distanceToObstacle(QGraphicsItem **item) const;
-
-//! [0]
-signals:
-    void tankSpotted(qreal direction, qreal distance);
-    void collision(const QLineF &collidedLine);
-    void actionCompleted();
-    void cannonFired();
-    void aboutToBeDestroyed();
-
-public slots:
-    void moveForwards(qreal length = 10.0);
-    void moveBackwards(qreal length = 10.0);
-    void turn(qreal degrees = 30.0);
-    void turnTo(qreal degrees = 0.0);
-    void stop();
-    void fireCannon();
-//! [0]
-
-protected:
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
-
-private:
-    void setAction(Action *newAction);
-
-    Action *m_currentAction;
-    qreal m_currentDirection;
-    QColor m_color;
-    bool m_enabled;
-};
-
-#endif
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro b/examples/statemachine/tankgameplugins/random_ai/random_ai.pro
deleted file mode 100644
index 5bc0b26..0000000
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = random_ai_plugin.h
-SOURCES       = random_ai_plugin.cpp
-TARGET        = $$qtLibraryTarget(random_ai)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS random_ai.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/random_ai
\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
deleted file mode 100644
index ddfd1c5..0000000
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "random_ai_plugin.h"
-
-#include <QState>
-#include <QTime>
-#include <QtPlugin>
-
-QState *RandomAiPlugin::create(QState *parentState, QObject *tank)
-{
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
-
-    QState *topLevel = new QState(parentState);
-
-    QState *selectNextActionState = new SelectActionState(topLevel);
-    topLevel->setInitialState(selectNextActionState);
-
-    QState *fireState = new RandomDistanceState(topLevel);
-    connect(fireState, SIGNAL(distanceComputed(qreal)), tank, SLOT(fireCannon()));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(fireSelected()), fireState);
-
-    QState *moveForwardsState = new RandomDistanceState(topLevel);
-    connect(moveForwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveForwards(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveForwardsSelected()), moveForwardsState);
-
-    QState *moveBackwardsState = new RandomDistanceState(topLevel);
-    connect(moveBackwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveBackwards(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveBackwardsSelected()), moveBackwardsState);
-
-    QState *turnState = new RandomDistanceState(topLevel);
-    connect(turnState, SIGNAL(distanceComputed(qreal)), tank, SLOT(turn(qreal)));
-    selectNextActionState->addTransition(selectNextActionState, SIGNAL(turnSelected()), turnState);
-
-    topLevel->addTransition(tank, SIGNAL(actionCompleted()), selectNextActionState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(random_ai, RandomAiPlugin)
diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h
deleted file mode 100644
index 4c3fc0f..0000000
--- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef RANDOM_AI_PLUGIN_H
-#define RANDOM_AI_PLUGIN_H
-
-#include <QObject>
-#include <QState>
-
-#include <tankgame/plugin.h>
-
-class SelectActionState: public QState
-{
-    Q_OBJECT
-public:
-    SelectActionState(QState *parent = 0) : QState(parent)
-    {
-    }
-
-signals:
-    void fireSelected();
-    void moveForwardsSelected();
-    void moveBackwardsSelected();
-    void turnSelected();
-
-protected:
-    void onEntry(QEvent *)
-    {
-        int rand = qrand() % 4;
-        switch (rand) {
-        case 0: emit fireSelected(); break;
-        case 1: emit moveForwardsSelected(); break;
-        case 2: emit moveBackwardsSelected(); break;
-        case 3: emit turnSelected(); break;
-        };
-    }
-};
-
-class RandomDistanceState: public QState
-{
-    Q_OBJECT
-public:
-    RandomDistanceState(QState *parent = 0) : QState(parent)
-    {
-    }
-
-signals:
-    void distanceComputed(qreal distance);
-
-protected:
-    void onEntry(QEvent *)
-    {
-        emit distanceComputed(qreal(qrand() % 180));
-    }
-};
-
-class RandomAiPlugin: public QObject, public Plugin
-{
-    Q_OBJECT
-    Q_INTERFACES(Plugin)
-public:
-    RandomAiPlugin() { setObjectName("Random"); }
-
-    virtual QState *create(QState *parentState, QObject *tank);
-};
-
-#endif // RANDOM_AI_PLUGIN_H
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
deleted file mode 100644
index 79d7d0c..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $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
deleted file mode 100644
index 1bc5b26..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $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
deleted file mode 100644
index 0d8bf2e..0000000
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp
deleted file mode 100644
index 4e71285..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "spin_ai.h"
-
-#include <QtPlugin>
-
-QState *SpinAi::create(QState *parentState, QObject *tank)
-{
-    QState *topLevel = new QState(parentState);
-    QState *spinState = new SpinState(tank, topLevel);
-    topLevel->setInitialState(spinState);
-
-    // When tank is spotted, fire two times and go back to spin state
-    QState *fireState = new QState(topLevel);
-
-    QState *fireOnce = new QState(fireState);
-    fireState->setInitialState(fireOnce);
-    connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    QState *fireTwice = new QState(fireState);
-    connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice);
-    fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState);
-
-    spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(spin_ai, SpinAi)
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
deleted file mode 100644
index a97024d..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SPIN_AI_H
-#define SPIN_AI_H
-
-#include <tankgame/plugin.h>
-
-#include <QObject>
-#include <QState>
-#include <QVariant>
-
-class SpinState: public QState
-{
-    Q_OBJECT
-public:
-    SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank)
-    {
-    }
-
-public slots:
-    void spin()
-    {
-        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
-    }
-
-protected:
-    void onEntry(QEvent *)
-    {
-        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-        spin();
-    }
-
-    void onExit(QEvent *)
-    {
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-    }
-
-private:
-    QObject *m_tank;
-
-};
-
-class SpinAi: public QObject, public Plugin
-{
-    Q_OBJECT
-    Q_INTERFACES(Plugin)
-public:
-    SpinAi() { setObjectName("Spin and destroy"); }
-
-    virtual QState *create(QState *parentState, QObject *tank);
-};
-
-#endif
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro
deleted file mode 100644
index 8ab4da0..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = spin_ai.h
-SOURCES       = spin_ai.cpp
-TARGET        = $$qtLibraryTarget(spin_ai)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai
\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp
deleted file mode 100644
index 12a9656..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "spin_ai_with_error.h"
-
-#include <QtPlugin>
-
-QState *SpinAiWithError::create(QState *parentState, QObject *tank)
-{
-    QState *topLevel = new QState(parentState);
-    QState *spinState = new SpinState(tank, topLevel);
-    topLevel->setInitialState(spinState);
-
-    // When tank is spotted, fire two times and go back to spin state
-    // (no initial state set for fireState will lead to run-time error in machine)
-    QState *fireState = new QState(topLevel);
-
-    QState *fireOnce = new QState(fireState);
-    connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    QState *fireTwice = new QState(fireState);
-    connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon()));
-
-    fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice);
-    fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState);
-
-    spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState);
-
-    return topLevel;
-}
-
-Q_EXPORT_PLUGIN2(spin_ai_with_error, SpinAiWithError)
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
deleted file mode 100644
index f35da26..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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 http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SPIN_AI_WITH_ERROR_H
-#define SPIN_AI_WITH_ERROR_H
-
-#include <tankgame/plugin.h>
-
-#include <QObject>
-#include <QState>
-#include <QVariant>
-
-class SpinState: public QState
-{
-    Q_OBJECT
-public:
-    SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank)
-    {
-    }
-
-public slots:
-    void spin()
-    {
-        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
-    }
-
-protected:
-    void onEntry(QEvent *)
-    {
-        connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-        spin();
-    }
-
-    void onExit(QEvent *)
-    {
-        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
-    }
-
-private:
-    QObject *m_tank;
-
-};
-
-class SpinAiWithError: public QObject, public Plugin
-{
-    Q_OBJECT
-    Q_INTERFACES(Plugin)
-public:
-    SpinAiWithError() { setObjectName("Spin and destroy with runtime error in state machine"); }
-
-    virtual QState *create(QState *parentState, QObject *tank);
-};
-
-#endif
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro
deleted file mode 100644
index 124cf98..0000000
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = lib
-CONFIG       += plugin
-INCLUDEPATH  += ../..
-HEADERS       = spin_ai_with_error.h
-SOURCES       = spin_ai_with_error.cpp
-TARGET        = $$qtLibraryTarget(spin_ai_with_error)
-DESTDIR       = ../../tankgame/plugins
-
-#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai_with_error.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai_with_error
\ No newline at end of file
diff --git a/examples/statemachine/tankgameplugins/tankgameplugins.pro b/examples/statemachine/tankgameplugins/tankgameplugins.pro
deleted file mode 100644
index a098e03..0000000
--- a/examples/statemachine/tankgameplugins/tankgameplugins.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS       = random_ai \
-                spin_ai_with_error \
-                spin_ai \
-                seek_ai 
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgameplugins.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins
-INSTALLS += target sources
diff --git a/examples/tools/completer/mainwindow.cpp b/examples/tools/completer/mainwindow.cpp
index 8ea1c39..c98482a 100644
--- a/examples/tools/completer/mainwindow.cpp
+++ b/examples/tools/completer/mainwindow.cpp
@@ -78,6 +78,12 @@ MainWindow::MainWindow(QWidget *parent)
 //! [0]
 
 //! [1]
+    QLabel *maxVisibleLabel = new QLabel;
+    maxVisibleLabel->setText(tr("Max Visible Items"));
+    maxVisibleSpinBox = new QSpinBox;
+    maxVisibleSpinBox->setRange(3,25);
+    maxVisibleSpinBox->setValue(10);
+
     wrapCheckBox = new QCheckBox;
     wrapCheckBox->setText(tr("Wrap around completions"));
     wrapCheckBox->setChecked(true);
@@ -90,6 +96,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(modelCombo, SIGNAL(activated(int)), this, SLOT(changeModel()));
     connect(modeCombo, SIGNAL(activated(int)), this, SLOT(changeMode(int)));
     connect(caseCombo, SIGNAL(activated(int)), this, SLOT(changeCase(int)));
+    connect(maxVisibleSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeMaxVisible(int)));
 //! [2]
 
 //! [3]
@@ -99,9 +106,10 @@ MainWindow::MainWindow(QWidget *parent)
     layout->addWidget(modelLabel, 0, 0); layout->addWidget(modelCombo, 0, 1);
     layout->addWidget(modeLabel, 1, 0);  layout->addWidget(modeCombo, 1, 1);
     layout->addWidget(caseLabel, 2, 0);  layout->addWidget(caseCombo, 2, 1);
-    layout->addWidget(wrapCheckBox, 3, 0);
-    layout->addWidget(contentsLabel, 4, 0, 1, 2);
-    layout->addWidget(lineEdit, 5, 0, 1, 2);
+    layout->addWidget(maxVisibleLabel, 3, 0); layout->addWidget(maxVisibleSpinBox, 3, 1);
+    layout->addWidget(wrapCheckBox, 4, 0);
+    layout->addWidget(contentsLabel, 5, 0, 1, 2);
+    layout->addWidget(lineEdit, 6, 0, 1, 2);
     centralWidget->setLayout(layout);
     setCentralWidget(centralWidget);
 
@@ -205,6 +213,7 @@ void MainWindow::changeModel()
 {
     delete completer;
     completer = new QCompleter(this);
+    completer->setMaxVisibleItems(maxVisibleSpinBox->value());
 
     switch (modelCombo->currentIndex()) {
     default:
@@ -256,9 +265,16 @@ void MainWindow::changeModel()
 //! [14]
 
 //! [15]
+void MainWindow::changeMaxVisible(int max)
+{
+    completer->setMaxVisibleItems(max);
+}
+//! [15]
+
+//! [16]
 void MainWindow::about()
 {
     QMessageBox::about(this, tr("About"), tr("This example demonstrates the "
         "different features of the QCompleter class."));
 }
-//! [15]
+//! [16]
diff --git a/examples/tools/completer/mainwindow.h b/examples/tools/completer/mainwindow.h
index f6c962b..30b8d26 100644
--- a/examples/tools/completer/mainwindow.h
+++ b/examples/tools/completer/mainwindow.h
@@ -52,6 +52,7 @@ class QLabel;
 class QLineEdit;
 class QProgressBar;
 class QCheckBox;
+class QSpinBox;
 QT_END_NAMESPACE
 
 //! [0]
@@ -67,6 +68,7 @@ private slots:
     void changeCase(int);
     void changeMode(int);
     void changeModel();
+    void changeMaxVisible(int);
 //! [0]
 
 //! [1]
@@ -77,6 +79,7 @@ private:
     QComboBox *caseCombo;
     QComboBox *modeCombo;
     QComboBox *modelCombo;
+    QSpinBox *maxVisibleSpinBox;
     QCheckBox *wrapCheckBox;
     QCompleter *completer;
     QLabel *contentsLabel;
diff --git a/examples/tools/regexp/regexpdialog.cpp b/examples/tools/regexp/regexpdialog.cpp
index 42cb617..7aab1be 100644
--- a/examples/tools/regexp/regexpdialog.cpp
+++ b/examples/tools/regexp/regexpdialog.cpp
@@ -69,6 +69,7 @@ RegExpDialog::RegExpDialog(QWidget *parent)
     syntaxComboBox->addItem(tr("Regular expression v2"), QRegExp::RegExp2);
     syntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard);
     syntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString);
+    syntaxComboBox->addItem(tr("W3C Xml Schema 1.1"), QRegExp::W3CXmlSchema11);
 
     syntaxLabel = new QLabel(tr("&Pattern Syntax:"));
     syntaxLabel->setBuddy(syntaxComboBox);
diff --git a/examples/widgets/tablet/tabletcanvas.cpp b/examples/widgets/tablet/tabletcanvas.cpp
index 4e8150e..3e9ae38 100644
--- a/examples/widgets/tablet/tabletcanvas.cpp
+++ b/examples/widgets/tablet/tabletcanvas.cpp
@@ -137,11 +137,6 @@ void TabletCanvas::paintImage(QPainter &painter, QTabletEvent *event)
     QPoint brushAdjust(10, 10);
 
     switch (myTabletDevice) {
-        case QTabletEvent::Stylus:
-            painter.setBrush(myBrush);
-            painter.setPen(myPen);
-            painter.drawLine(polyLine[1], event->pos());
-            break;
         case QTabletEvent::Airbrush:
             myBrush.setColor(myColor);
             myBrush.setStyle(brushPattern(event->pressure()));
@@ -156,10 +151,32 @@ void TabletCanvas::paintImage(QPainter &painter, QTabletEvent *event)
         case QTabletEvent::Puck:
         case QTabletEvent::FourDMouse:
         case QTabletEvent::RotationStylus:
-            qWarning("This input device is not supported by the example.");
+            {
+                const QString error(tr("This input device is not supported by the example."));
+#ifndef QT_NO_STATUSTIP
+                QStatusTipEvent status(error);
+                QApplication::sendEvent(this, &status);
+#else
+                qWarning() << error;
+#endif
+            }
             break;
         default:
-            qWarning("Unknown tablet device.");
+            {
+                const QString error(tr("Unknown tablet device - treating as stylus"));
+#ifndef QT_NO_STATUSTIP
+                QStatusTipEvent status(error);
+                QApplication::sendEvent(this, &status);
+#else
+                qWarning() << error;
+#endif
+            }
+            // FALL-THROUGH
+        case QTabletEvent::Stylus:
+            painter.setBrush(myBrush);
+            painter.setPen(myPen);
+            painter.drawLine(polyLine[1], event->pos());
+            break;
     }
 }
 //! [5]
@@ -250,7 +267,7 @@ void TabletCanvas::updateBrush(QTabletEvent *event)
 }
 //! [11]
 
-void TabletCanvas::resizeEvent(QResizeEvent *event)
+void TabletCanvas::resizeEvent(QResizeEvent *)
 {
     initImage();
     polyLine[0] = polyLine[1] = polyLine[2] = QPoint();
diff --git a/examples/xmlpatterns/schema/files/contact.xsd b/examples/xmlpatterns/schema/files/contact.xsd
new file mode 100644
index 0000000..3e1b570
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/contact.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:element name="contact">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="givenName" type="xsd:string"/>
+                <xsd:element name="familyName" type="xsd:string"/>
+                <xsd:element name="birthdate" type="xsd:date" minOccurs="0"/>
+                <xsd:element name="homeAddress" type="address"/>
+                <xsd:element name="workAddress" type="address" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="address">
+        <xsd:sequence>
+            <xsd:element name="street" type="xsd:string"/>
+            <xsd:element name="zipCode" type="xsd:string"/>
+            <xsd:element name="city" type="xsd:string"/>
+            <xsd:element name="country" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/examples/xmlpatterns/schema/files/invalid_contact.xml b/examples/xmlpatterns/schema/files/invalid_contact.xml
new file mode 100644
index 0000000..42f1edd
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/invalid_contact.xml
@@ -0,0 +1,11 @@
+<contact>
+    <givenName>John</givenName>
+    <familyName>Doe</familyName>
+    <title>Prof.</title>
+    <workAddress>
+        <street>Sandakerveien 116</street>
+        <zipCode>N-0550</zipCode>
+        <city>Oslo</city>
+        <country>Norway</country>
+    </workAddress>
+</contact>
diff --git a/examples/xmlpatterns/schema/files/invalid_order.xml b/examples/xmlpatterns/schema/files/invalid_order.xml
new file mode 100644
index 0000000..8ffc5fd
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/invalid_order.xml
@@ -0,0 +1,13 @@
+<order>
+    <customerId>234219</customerId>
+    <article>
+        <articleId>21692</articleId>
+        <count>3</count>
+    </article>
+    <article>
+        <articleId>24749</articleId>
+        <count>9</count>
+    </article>
+    <deliveryDate>2009-01-23</deliveryDate>
+    <payed>yes</payed>
+</order>
diff --git a/examples/xmlpatterns/schema/files/invalid_recipe.xml b/examples/xmlpatterns/schema/files/invalid_recipe.xml
new file mode 100644
index 0000000..4d75af6
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/invalid_recipe.xml
@@ -0,0 +1,14 @@
+<recipe>
+    <title>Cheese on Toast</title>
+    <ingredient name="Bread" quantity="2" unit="slices"/>
+    <ingredient name="Cheese" quantity="2" unit="slices"/>
+    <time quantity="3" unit="days"/>
+    <method>
+        <step>1. Slice the bread and cheese.</step>
+        <step>2. Grill one side of each slice of bread.</step>
+        <step>3. Turn over the bread and place a slice of cheese on each piece.</step>
+        <step>4. Grill until the cheese has started to melt.</step>
+        <step>5. Serve and enjoy!</step>
+    </method>
+    <comment>Tell your friends about it!</comment>
+</recipe>
diff --git a/examples/xmlpatterns/schema/files/order.xsd b/examples/xmlpatterns/schema/files/order.xsd
new file mode 100644
index 0000000..405cafe
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/order.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:element name="order">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="customerId" type="xsd:positiveInteger"/>
+                <xsd:element name="article" type="articleType" maxOccurs="unbounded"/>
+                <xsd:element name="deliveryDate" type="xsd:date"/>
+                <xsd:element name="payed" type="xsd:boolean"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="articleType">
+        <xsd:sequence>
+            <xsd:element name="articleId" type="xsd:positiveInteger"/>
+            <xsd:element name="count" type="xsd:positiveInteger"/>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/examples/xmlpatterns/schema/files/recipe.xsd b/examples/xmlpatterns/schema/files/recipe.xsd
new file mode 100644
index 0000000..bbbafd9
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/recipe.xsd
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:element name="recipe">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="title" type="xsd:string"/>
+                <xsd:element name="ingredient" type="ingredientType" maxOccurs="unbounded"/>
+                <xsd:element name="time" type="timeType"/>
+                <xsd:element name="method">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:element name="step" type="xsd:string" maxOccurs="unbounded"/>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="ingredientType">
+        <xsd:attribute name="name" type="xsd:string"/>
+        <xsd:attribute name="quantity" type="xsd:positiveInteger"/>
+        <xsd:attribute name="unit" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="timeType">
+        <xsd:attribute name="quantity" type="xsd:positiveInteger"/>
+        <xsd:attribute name="unit">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="seconds"/>
+                    <xsd:enumeration value="minutes"/>
+                    <xsd:enumeration value="hours"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/examples/xmlpatterns/schema/files/valid_contact.xml b/examples/xmlpatterns/schema/files/valid_contact.xml
new file mode 100644
index 0000000..53c04d4
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/valid_contact.xml
@@ -0,0 +1,11 @@
+<contact>
+    <givenName>John</givenName>
+    <familyName>Doe</familyName>
+    <birthdate>1977-12-25</birthdate>
+    <homeAddress>
+        <street>Sandakerveien 116</street>
+        <zipCode>N-0550</zipCode>
+        <city>Oslo</city>
+        <country>Norway</country>
+    </homeAddress>
+</contact>
diff --git a/examples/xmlpatterns/schema/files/valid_order.xml b/examples/xmlpatterns/schema/files/valid_order.xml
new file mode 100644
index 0000000..f83c36c
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/valid_order.xml
@@ -0,0 +1,18 @@
+<order>
+    <customerId>194223</customerId>
+    <article>
+        <articleId>22242</articleId>
+        <count>5</count>
+    </article>
+    <article>
+        <articleId>32372</articleId>
+        <count>12</count>
+        <comment>without stripes</comment>
+    </article>
+    <article>
+        <articleId>23649</articleId>
+        <count>2</count>
+    </article>
+    <deliveryDate>2009-01-23</deliveryDate>
+    <payed>true</payed>
+</order>
diff --git a/examples/xmlpatterns/schema/files/valid_recipe.xml b/examples/xmlpatterns/schema/files/valid_recipe.xml
new file mode 100644
index 0000000..f6499ba
--- /dev/null
+++ b/examples/xmlpatterns/schema/files/valid_recipe.xml
@@ -0,0 +1,13 @@
+<recipe>
+    <title>Cheese on Toast</title>
+    <ingredient name="Bread" quantity="2" unit="slices"/>
+    <ingredient name="Cheese" quantity="2" unit="slices"/>
+    <time quantity="3" unit="minutes"/>
+    <method>
+        <step>1. Slice the bread and cheese.</step>
+        <step>2. Grill one side of each slice of bread.</step>
+        <step>3. Turn over the bread and place a slice of cheese on each piece.</step>
+        <step>4. Grill until the cheese has started to melt.</step>
+        <step>5. Serve and enjoy!</step>
+    </method>
+</recipe>
diff --git a/examples/statemachine/tankgame/main.cpp b/examples/xmlpatterns/schema/main.cpp
index 85e2747..b1ec8b0 100644
--- a/examples/statemachine/tankgame/main.cpp
+++ b/examples/xmlpatterns/schema/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
@@ -39,15 +39,16 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QtGui>
 #include "mainwindow.h"
 
-int main(int argc, char **argv)
+//! [0]
+int main(int argc, char* argv[])
 {
+    Q_INIT_RESOURCE(schema);
     QApplication app(argc, argv);
-
-    MainWindow mainWindow;
-    mainWindow.show();
-
+    MainWindow* const window = new MainWindow;
+    window->show();
     return app.exec();
 }
+//! [0]
diff --git a/examples/xmlpatterns/schema/mainwindow.cpp b/examples/xmlpatterns/schema/mainwindow.cpp
new file mode 100644
index 0000000..0bb21f5
--- /dev/null
+++ b/examples/xmlpatterns/schema/mainwindow.cpp
@@ -0,0 +1,218 @@
+/****************************************************************************
+**
+** 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 http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtXmlPatterns>
+
+#include "mainwindow.h"
+#include "xmlsyntaxhighlighter.h"
+
+//! [4]
+class MessageHandler : public QAbstractMessageHandler
+{
+    public:
+        MessageHandler()
+            : QAbstractMessageHandler(0)
+        {
+        }
+
+        QString statusMessage() const
+        {
+            return m_description;
+        }
+
+        int line() const
+        {
+            return m_sourceLocation.line();
+        }
+
+        int column() const
+        {
+            return m_sourceLocation.column();
+        }
+
+    protected:
+        virtual void handleMessage(QtMsgType type, const QString &description,
+                                   const QUrl &identifier, const QSourceLocation &sourceLocation)
+        {
+            Q_UNUSED(type);
+            Q_UNUSED(identifier);
+
+            m_messageType = type;
+            m_description = description;
+            m_sourceLocation = sourceLocation;
+        }
+
+    private:
+        QtMsgType m_messageType;
+        QString m_description;
+        QSourceLocation m_sourceLocation;
+};
+//! [4]
+
+//! [0]
+MainWindow::MainWindow()
+{
+    setupUi(this);
+
+    new XmlSyntaxHighlighter(schemaView->document());
+    new XmlSyntaxHighlighter(instanceEdit->document());
+
+    schemaSelection->addItem(tr("Contact Schema"));
+    schemaSelection->addItem(tr("Recipe Schema"));
+    schemaSelection->addItem(tr("Order Schema"));
+
+    instanceSelection->addItem(tr("Valid Contact Instance"));
+    instanceSelection->addItem(tr("Invalid Contact Instance"));
+
+    connect(schemaSelection, SIGNAL(currentIndexChanged(int)), SLOT(schemaSelected(int)));
+    connect(instanceSelection, SIGNAL(currentIndexChanged(int)), SLOT(instanceSelected(int)));
+    connect(validateButton, SIGNAL(clicked()), SLOT(validate()));
+    connect(instanceEdit, SIGNAL(textChanged()), SLOT(textChanged()));
+
+    validationStatus->setAlignment(Qt::AlignCenter | Qt::AlignVCenter);
+
+    schemaSelected(0);
+    instanceSelected(0);
+}
+//! [0]
+
+//! [1]
+void MainWindow::schemaSelected(int index)
+{
+    instanceSelection->clear();
+    if (index == 0) {
+        instanceSelection->addItem(tr("Valid Contact Instance"));
+        instanceSelection->addItem(tr("Invalid Contact Instance"));
+    } else if (index == 1) {
+        instanceSelection->addItem(tr("Valid Recipe Instance"));
+        instanceSelection->addItem(tr("Invalid Recipe Instance"));
+    } else if (index == 2) {
+        instanceSelection->addItem(tr("Valid Order Instance"));
+        instanceSelection->addItem(tr("Invalid Order Instance"));
+    }
+    textChanged();
+
+    QFile schemaFile(QString(":/schema_%1.xsd").arg(index));
+    schemaFile.open(QIODevice::ReadOnly);
+    const QString schemaText(QString::fromUtf8(schemaFile.readAll()));
+    schemaView->setPlainText(schemaText);
+
+    validate();
+}
+//! [1]
+
+//! [2]
+void MainWindow::instanceSelected(int index)
+{
+    QFile instanceFile(QString(":/instance_%1.xml").arg((2*schemaSelection->currentIndex()) + index));
+    instanceFile.open(QIODevice::ReadOnly);
+    const QString instanceText(QString::fromUtf8(instanceFile.readAll()));
+    instanceEdit->setPlainText(instanceText);
+
+    validate();
+}
+//! [2]
+
+//! [3]
+void MainWindow::validate()
+{
+    const QByteArray schemaData = schemaView->toPlainText().toUtf8();
+    const QByteArray instanceData = instanceEdit->toPlainText().toUtf8();
+
+    MessageHandler messageHandler;
+
+    QXmlSchema schema;
+    schema.setMessageHandler(&messageHandler);
+
+    schema.load(schemaData);
+
+    bool errorOccurred = false;
+    if (!schema.isValid()) {
+        errorOccurred = true;
+    } else {
+        QXmlSchemaValidator validator(schema);
+        if (!validator.validate(instanceData))
+            errorOccurred = true;
+    }
+
+    if (errorOccurred) {
+        validationStatus->setText(messageHandler.statusMessage());
+        moveCursor(messageHandler.line(), messageHandler.column());
+    } else {
+        validationStatus->setText(tr("validation successful"));
+    }
+
+    const QString styleSheet = QString("QLabel {background: %1; padding: 3px}")
+                                      .arg(errorOccurred ? QColor(Qt::red).lighter(160).name() :
+                                                           QColor(Qt::green).lighter(160).name());
+    validationStatus->setStyleSheet(styleSheet);
+}
+//! [3]
+
+void MainWindow::textChanged()
+{
+    instanceEdit->setExtraSelections(QList<QTextEdit::ExtraSelection>());
+}
+
+void MainWindow::moveCursor(int line, int column)
+{
+    instanceEdit->moveCursor(QTextCursor::Start);
+    for (int i = 1; i < line; ++i)
+        instanceEdit->moveCursor(QTextCursor::Down);
+
+    for (int i = 1; i < column; ++i)
+        instanceEdit->moveCursor(QTextCursor::Right);
+
+    QList<QTextEdit::ExtraSelection> extraSelections;
+    QTextEdit::ExtraSelection selection;
+
+    const QColor lineColor = QColor(Qt::red).lighter(160);
+    selection.format.setBackground(lineColor);
+    selection.format.setProperty(QTextFormat::FullWidthSelection, true);
+    selection.cursor = instanceEdit->textCursor();
+    selection.cursor.clearSelection();
+    extraSelections.append(selection);
+
+    instanceEdit->setExtraSelections(extraSelections);
+
+    instanceEdit->setFocus();
+}
diff --git a/examples/statemachine/tankgame/plugin.h b/examples/xmlpatterns/schema/mainwindow.h
index 97e4640..420c627 100644
--- a/examples/statemachine/tankgame/plugin.h
+++ b/examples/xmlpatterns/schema/mainwindow.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
@@ -39,24 +39,30 @@
 **
 ****************************************************************************/
 
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
 
-#include <QtPlugin>
+#include <QMainWindow>
 
-QT_BEGIN_NAMESPACE
-class QState;
-QT_END_NAMESPACE
-class Plugin
+#include "ui_schema.h"
+
+//! [0]
+class MainWindow : public QMainWindow,
+                   private Ui::SchemaMainWindow
 {
-public:
-    virtual ~Plugin() {}
+    Q_OBJECT
 
-    virtual QState *create(QState *parentState, QObject *tank) = 0;
-};
+  public:
+    MainWindow();
 
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(Plugin, "TankPlugin")
-QT_END_NAMESPACE
+  private Q_SLOTS:
+    void schemaSelected(int index);
+    void instanceSelected(int index);
+    void validate();
+    void textChanged();
 
+  private:
+    void moveCursor(int line, int column);
+};
+//! [0]
 #endif
diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro
new file mode 100644
index 0000000..af32e0a
--- /dev/null
+++ b/examples/xmlpatterns/schema/schema.pro
@@ -0,0 +1,11 @@
+QT          += xmlpatterns
+FORMS       += schema.ui
+HEADERS     = mainwindow.h ../shared/xmlsyntaxhighlighter.h
+RESOURCES   = schema.qrc
+SOURCES     = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
+INCLUDEPATH += ../shared/
+
+target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html files
+sources.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema
+INSTALLS += target sources
diff --git a/examples/xmlpatterns/schema/schema.qrc b/examples/xmlpatterns/schema/schema.qrc
new file mode 100644
index 0000000..eb7ddfd
--- /dev/null
+++ b/examples/xmlpatterns/schema/schema.qrc
@@ -0,0 +1,13 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="schema_0.xsd">files/contact.xsd</file>
+    <file alias="schema_1.xsd">files/recipe.xsd</file>
+    <file alias="schema_2.xsd">files/order.xsd</file>
+    <file alias="instance_0.xml">files/valid_contact.xml</file>
+    <file alias="instance_1.xml">files/invalid_contact.xml</file>
+    <file alias="instance_2.xml">files/valid_recipe.xml</file>
+    <file alias="instance_3.xml">files/invalid_recipe.xml</file>
+    <file alias="instance_4.xml">files/valid_order.xml</file>
+    <file alias="instance_5.xml">files/invalid_order.xml</file>
+</qresource>
+</RCC>
diff --git a/examples/xmlpatterns/schema/schema.ui b/examples/xmlpatterns/schema/schema.ui
new file mode 100644
index 0000000..b67f444
--- /dev/null
+++ b/examples/xmlpatterns/schema/schema.ui
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SchemaMainWindow</class>
+ <widget class="QMainWindow" name="SchemaMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>417</width>
+    <height>594</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>XML Schema Validation</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0" colspan="2">
+     <widget class="QLabel" name="schemaLabel">
+      <property name="text">
+       <string>XML Schema Document:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2" colspan="2">
+     <widget class="QComboBox" name="schemaSelection"/>
+    </item>
+    <item row="1" column="0" colspan="4">
+     <widget class="QTextBrowser" name="schemaView"/>
+    </item>
+    <item row="2" column="0" colspan="2">
+     <widget class="QLabel" name="instanceLabel">
+      <property name="text">
+       <string>XML Instance Document:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="2" colspan="2">
+     <widget class="QComboBox" name="instanceSelection"/>
+    </item>
+    <item row="3" column="0" colspan="4">
+     <widget class="QTextEdit" name="instanceEdit"/>
+    </item>
+    <item row="4" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Status:</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1" colspan="2">
+     <widget class="QLabel" name="validationStatus">
+      <property name="text">
+       <string>not validated</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="3">
+     <widget class="QPushButton" name="validateButton">
+      <property name="text">
+       <string>Validate</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index 943055a..105ede4 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@ -111,7 +111,9 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 
 void MainWindow::paintEvent(QPaintEvent*)
 {
-    QLinearGradient gradient(QPoint(width()/2, 0), QPoint(width()/2, height()));
+    const QPoint start(width()/2, 0);
+    const QPoint finalStop(width()/2, height());
+    QLinearGradient gradient(start, finalStop);
     const QColor qtGreen(102, 176, 54);
     gradient.setColorAt(0, qtGreen.dark());
     gradient.setColorAt(0.5, qtGreen);
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/xmlpatterns/xmlpatterns.pro
index 1a57005..3ff3e35 100644
--- a/examples/xmlpatterns/xmlpatterns.pro
+++ b/examples/xmlpatterns/xmlpatterns.pro
@@ -2,7 +2,8 @@ TEMPLATE      = subdirs
 SUBDIRS       = recipes \
                 trafficinfo \
                 xquery  \
-                filetree
+                filetree \
+                schema
 
 # This example depends on QtWebkit as well.
 contains(QT_CONFIG, webkit):SUBDIRS += qobjectxmlmodel