Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	demos/declarative/samegame/SamegameCore/samegame.js
	mkspecs/features/symbian/default_post.prf
	src/declarative/qml/qdeclarativeengine.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/plugins/plugins.pro
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def
	src/s60installs/s60installs.pro
	tests/auto/declarative/declarative.pro
	tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
	tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
	tests/auto/declarative/qmlvisual/qmlvisual.pro

2 files changed, 63 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml b/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml
new file mode 100644
index 0000000..4a80e83
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml
@@ -0,0 +1,28 @@
+import QtQuick 1.0
+
+Item {
+    id: root
+    property string value: "base"
+
+    MouseArea {
+        id: mouseArea
+        width: 200; height: 200
+        onClicked: toggleState.state = "toggled"
+    }
+
+    StateGroup {
+        states: State {
+            name: "pressed"
+            when: mouseArea.pressed
+            PropertyChanges { target: root; value: "pressed" }
+        }
+    }
+
+    StateGroup {
+        id: toggleState
+        states: State {
+            name: "toggled"
+            PropertyChanges { target: root; value: "toggled" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 9d7cc05..845d6bb 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -64,6 +64,7 @@ private slots:
     void onMousePressRejected();
     void doubleClick();
     void clickTwice();
+    void pressedOrdering();
 
 private:
     QDeclarativeView *createView();
@@ -477,6 +478,40 @@ void tst_QDeclarativeMouseArea::clickTwice()
     QCOMPARE(canvas->rootObject()->property("clicked").toInt(), 2);
 }
 
+void tst_QDeclarativeMouseArea::pressedOrdering()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pressedOrdering.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("base"));
+
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress);
+    pressEvent.setScenePos(QPointF(100, 100));
+    pressEvent.setButton(Qt::LeftButton);
+    pressEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("pressed"));
+
+    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
+    releaseEvent.setScenePos(QPointF(100, 100));
+    releaseEvent.setButton(Qt::LeftButton);
+    releaseEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &releaseEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("toggled"));
+
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("pressed"));
+
+    delete canvas;
+}
+
 QTEST_MAIN(tst_QDeclarativeMouseArea)
 
 #include "tst_qdeclarativemousearea.moc"