Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/qnamespace.qdoc
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicsscene.cpp

8 files changed, 299 insertions, 13 deletions

diff --git a/doc/src/animation.qdoc b/doc/src/animation.qdoc
index 843e0aa81f..da9b40145c 100644
--- a/doc/src/animation.qdoc
+++ b/doc/src/animation.qdoc
@@ -208,12 +208,6 @@
     Note that QObject must be the first class inherited as the
     meta-object system demands this.
 
-    \warning The QItemAnimation class, which was initially intended
-    for animating \l{QGraphicsItem}s may be deprecated or removed from
-    the animation framework.
-
-    \omit (need something about the list of animations). \endomit
-
     \section1 Easing Curves
 
     As mentioned, QPropertyAnimation performs an interpolation between
diff --git a/doc/src/known-issues.qdoc b/doc/src/known-issues.qdoc
index e005b14b20..9c90908691 100644
--- a/doc/src/known-issues.qdoc
+++ b/doc/src/known-issues.qdoc
@@ -58,13 +58,6 @@
 
     \section1 Issues with Third Party Software
 
-    \section2 Intel Compiler Support
-
-    Although it is possible to build applications against Qt 4.5.x using Intel
-    CC 10, these applications will crash when run.  We recommend that developers
-    who rely on this compiler wait until a fix is available before upgrading to
-    the Qt 4.5.x series of releases.
-
     \section2 X11 Hardware Support
 
     \list
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 800e0bef2b..805855a904 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -2692,6 +2692,11 @@
   the last image is not cropped.
 */
 
+/*!
+    \enum Qt::Initialization
+    \internal
+*/
+
 /*! \enum Qt::GestureType
     \since 4.6
 
diff --git a/doc/src/snippets/statemachine/main.cpp b/doc/src/snippets/statemachine/main.cpp
new file mode 100644
index 0000000000..f20d245748
--- /dev/null
+++ b/doc/src/snippets/statemachine/main.cpp
@@ -0,0 +1,48 @@
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+    QLabel *label = new QLabel;
+
+//![0]
+    QStateMachine machine;
+    QState *s1 = new QState();
+    QState *s2 = new QState();
+    QState *s3 = new QState();
+//![0]
+
+//![4]
+    s1->assignProperty(label, "text", "In state s1");
+    s2->assignProperty(label, "text", "In state s2");
+    s3->assignProperty(label, "text", "In state s3");
+//![4]
+
+//![5]
+    QObject::connect(s3, SIGNAL(entered()), button, SLOT(showMaximized()));
+    QObject::connect(s3, SIGNAL(exited()), button, SLOT(showMinimized()));
+//![5]
+
+//![1]
+    s1->addTransition(button, SIGNAL(clicked()), s2);
+    s2->addTransition(button, SIGNAL(clicked()), s3);
+    s3->addTransition(button, SIGNAL(clicked()), s1);
+//![1]
+
+//![2]
+    machine.addState(s1);
+    machine.addState(s2);
+    machine.addState(s3);
+    machine.setInitialState(s1);
+//![2]
+
+//![3]
+    machine.start();
+//![3]
+
+    label->show();
+
+    return app.exec();
+}
diff --git a/doc/src/snippets/statemachine/main2.cpp b/doc/src/snippets/statemachine/main2.cpp
new file mode 100644
index 0000000000..60a61e7caf
--- /dev/null
+++ b/doc/src/snippets/statemachine/main2.cpp
@@ -0,0 +1,51 @@
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+  QApplication app(argv, args);
+
+    QStateMachine machine;
+
+//![0]
+    QState *s1 = new QState();
+    QState *s11 = new QState(s1);
+    QState *s12 = new QState(s1);
+    QState *s13 = new QState(s1);
+    s1->setInitialState(s11);
+    machine.addState(s1);
+//![0]
+
+//![2]
+    s12>addTransition(quitButton, SIGNAL(clicked()), s12);
+//![2]
+
+//![1]
+    QFinalState *s2 = new QFinalState();
+    s1->addTransition(quitButton, SIGNAL(clicked()), s2);
+    machine.addState(s2);
+
+    QObject::connect(&machine, SIGNAL(finished()), QApplication::instance(), SLOT(quit()));
+//![1]
+
+  QButton *interruptButton = new QPushButton("Interrupt Button");
+
+//![3]
+    QHistoryState *s1h = s1->addHistoryState();
+
+    QState *s3 = new QState();
+    s3->assignProperty(label, "text", "In s3");
+    QMessageBox mbox;
+    mbox.addButton(QMessageBox::Ok);
+    mbox.setText("Interrupted!");
+    mbox.setIcon(QMessageBox::Information);
+    QObject::connect(s3, SIGNAL(entered()), &mbox, SLOT(exec()));
+    s3->addTransition(s1h);
+    machine.addState(s3);
+
+    s1->addTransition(interruptButton, SIGNAL(clicked()), s3);
+//![3]
+
+  return app.exec();
+}
+
diff --git a/doc/src/snippets/statemachine/main3.cpp b/doc/src/snippets/statemachine/main3.cpp
new file mode 100644
index 0000000000..b04b85025f
--- /dev/null
+++ b/doc/src/snippets/statemachine/main3.cpp
@@ -0,0 +1,21 @@
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+//![0]
+    QState *s1 = new QState(QState::ParallelStates);
+    // s11 and s12 will be entered in parallel
+    QState *s11 = new QState(s1);
+    QState *s12 = new QState(s1);
+//![0]
+
+//![1]
+  s1->addTransition(s1, SIGNAL(finished()), s2);
+//![1]
+
+    return app.exec();
+}
+
diff --git a/doc/src/snippets/statemachine/main4.cpp b/doc/src/snippets/statemachine/main4.cpp
new file mode 100644
index 0000000000..5681bbd24d
--- /dev/null
+++ b/doc/src/snippets/statemachine/main4.cpp
@@ -0,0 +1,71 @@
+
+#include <QtGui>
+
+
+//![0]
+struct StringEvent : public QEvent
+{
+    StringEvent(const QString &val)
+    : QEvent(QEvent::Type(QEvent::User+1)),
+      value(val) {}
+
+    QString value;
+};
+//![0]
+
+//![1]
+class StringTransition : public QAbstractTransition
+{
+public:
+    StringTransition(const QString &value)
+        : m_value(value) {}
+
+protected:
+    virtual bool eventTest(QEvent *e) const
+    {
+        if (e->type() != QEvent::Type(QEvent::User+1)) // StringEvent
+            return false;
+        StringEvent *se = static_cast<StringEvent*>(e);
+        return (m_value == se->value);
+    }
+    
+    virtual void onTransition(QEvent *) {}
+
+private:
+    QString m_value;
+};
+//![1]
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+//![2]
+    QStateMachine machine;
+    QState *s1 = new QState();
+    QState *s2 = new QState();
+    QFinalState *done = new QFinalState();
+
+    StringTransition *t1 = new StringTransition("Hello");
+    t1->setTargetState(s2);
+    s1->addTransition(t1);
+    StringTransition *t2 = new StringTransition("world");
+    t2->setTargetState(done);
+    s2->addTransition(t2);
+
+    machine.addState(s1);
+    machine.addState(s2);
+    machine.addState(done);
+    machine.setInitialState(s1);
+//![2]
+
+//![3]
+    machine.postEvent(new StringEvent("Hello"));
+    machine.postEvent(new StringEvent("world"));
+//![3]
+
+    return app.exec();
+}
+
+#include "main4.moc"
+
diff --git a/doc/src/snippets/statemachine/main5.cpp b/doc/src/snippets/statemachine/main5.cpp
new file mode 100644
index 0000000000..90ad8c7624
--- /dev/null
+++ b/doc/src/snippets/statemachine/main5.cpp
@@ -0,0 +1,103 @@
+
+#include <QtGui>
+
+int main(int argv, char **args)
+{
+    QApplication app(argv, args);
+
+  {
+//![0]
+    QStateMachine machine;
+    machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties);
+//![0]
+
+//![1]
+    QState *s1 = new QState();
+    s1->assignProperty(object, "fooBar", 1.0);
+    machine.addState(s1);
+    machine.setInitialState(s1);
+      
+    QState *s2 = new QState();  
+    machine.addState(s2);
+//![1]
+  }
+
+  {
+
+//![2]
+    QStateMachine machine;
+    machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties);
+      
+    QState *s1 = new QState();
+    s1->assignProperty(object, "fooBar", 1.0);
+    machine.addState(s1);
+    machine.setInitialState(s1);
+      
+    QState *s2 = new QState(s1);  
+    s2->assignProperty(object, "fooBar", 2.0);
+    s1->setInitialState(s2);
+          
+    QState *s3 = new QState(s1);
+//![2]
+
+  }
+
+  {
+//![3]
+    QState *s1 = new QState();
+    QState *s2 = new QState();      
+    
+    s1->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
+    s2->assignProperty(button, "geometry", QRectF(0, 0, 100, 100));
+    
+    s1->addTransition(button, SIGNAL(clicked()), s2);
+//![3]
+
+  }
+
+  {
+//![4]
+    QState *s1 = new QState();
+    QState *s2 = new QState();      
+    
+    s1->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
+    s2->assignProperty(button, "geometry", QRectF(0, 0, 100, 100));
+    
+    QSignalTransition *transition = s1->addTransition(button, SIGNAL(clicked()), s2);
+    transition->addAnimation(new QPropertyAnimation(button, "geometry"));
+//![4]
+
+  }
+
+  {
+
+//![5]
+    QState *s1 = new QState();
+    s1->assignProperty(button, "geometry", QRectF(0, 0, 50, 50));
+    
+    QState *s2 = new QState();
+    
+    s1->addTransition(s1, SIGNAL(polished()), s2);
+//![5]
+
+  }
+
+  {
+
+//![6]
+    QState *s1 = new QState();
+    QState *s2 = new QState();
+    
+    s2->assignProperty(object, "fooBar", 2.0);
+    s1->addTransition(s2);    
+    
+    QStateMachine machine;
+    machine.setInitialState(s1);
+    machine.addDefaultAnimation(new QPropertyAnimation(object, "fooBar"));    
+//![6]
+
+  }
+
+    return app.exec();
+}
+