Merge remote branch 'origin/master' into mobility-master

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp

4 files changed, 57 insertions, 19 deletions

diff --git a/tests/auto/declarative/qmlbehaviors/data/dontStart.qml b/tests/auto/declarative/qmlbehaviors/data/dontStart.qml
new file mode 100644
index 0000000..ba7cc9c
--- /dev/null
+++ b/tests/auto/declarative/qmlbehaviors/data/dontStart.qml
@@ -0,0 +1,18 @@
+import Qt 4.6
+
+Rectangle {
+    id: wrapper
+    width: 600
+    height: 400
+
+    Rectangle {
+        id: redRect
+        width: 100; height: 100
+        color: Qt.rgba(1,0,0)
+        x: Behavior {
+            NumberAnimation { objectName: "MyAnim"; running: true }
+        }
+
+    }
+
+}
diff --git a/tests/auto/declarative/qmlbehaviors/data/nonSelecting.qml b/tests/auto/declarative/qmlbehaviors/data/explicit.qml
index ba36d93..ba36d93 100644
--- a/tests/auto/declarative/qmlbehaviors/data/nonSelecting.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/explicit.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
index e9849eb..59cbd1a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
@@ -8,7 +8,7 @@ Rectangle {
         width: 100; height: 100; color: "green"
         x: Behavior {
             objectName: "MyBehavior";
-            NumberAnimation { matchTargets: rect; matchProperties: "y"; duration: 200; }
+            NumberAnimation { targets: rect; properties: "y"; duration: 200; }
         }
     }
     MouseRegion {
diff --git a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
index 73ab35e..99ec728 100644
--- a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
+++ b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -46,11 +46,11 @@
 #include <private/qmlbehavior_p.h>
 #include <private/qmlanimation_p.h>
 
-class tst_behaviors : public QObject
+class tst_qmlbehaviors : public QObject
 {
     Q_OBJECT
 public:
-    tst_behaviors() {}
+    tst_qmlbehaviors() {}
 
 private slots:
     void simpleBehavior();
@@ -63,12 +63,14 @@ private slots:
     //void transitionOverrides();
     void group();
     void emptyBehavior();
+    void explicitSelection();
     void nonSelectingBehavior();
     void reassignedAnimation();
     void disabled();
+    void dontStart();
 };
 
-void tst_behaviors::simpleBehavior()
+void tst_qmlbehaviors::simpleBehavior()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
@@ -82,7 +84,7 @@ void tst_behaviors::simpleBehavior()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_behaviors::scriptTriggered()
+void tst_qmlbehaviors::scriptTriggered()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
@@ -95,7 +97,7 @@ void tst_behaviors::scriptTriggered()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_behaviors::cppTriggered()
+void tst_qmlbehaviors::cppTriggered()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
@@ -111,7 +113,7 @@ void tst_behaviors::cppTriggered()
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
-void tst_behaviors::loop()
+void tst_qmlbehaviors::loop()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
@@ -122,7 +124,7 @@ void tst_behaviors::loop()
     rect->setState("moved");
 }
 
-void tst_behaviors::colorBehavior()
+void tst_qmlbehaviors::colorBehavior()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
@@ -135,7 +137,7 @@ void tst_behaviors::colorBehavior()
     QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
 }
 
-void tst_behaviors::parentBehavior()
+void tst_qmlbehaviors::parentBehavior()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
@@ -152,7 +154,7 @@ void tst_behaviors::parentBehavior()
     QVERIFY(parent == newParent);
 }
 
-void tst_behaviors::replaceBinding()
+void tst_qmlbehaviors::replaceBinding()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
@@ -186,7 +188,7 @@ void tst_behaviors::replaceBinding()
     QCOMPARE(innerRect->x(), (qreal)20);
 }
 
-void tst_behaviors::group()
+void tst_qmlbehaviors::group()
 {
     {
         QmlEngine engine;
@@ -213,7 +215,7 @@ void tst_behaviors::group()
     }
 }
 
-void tst_behaviors::emptyBehavior()
+void tst_qmlbehaviors::emptyBehavior()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
@@ -225,19 +227,23 @@ void tst_behaviors::emptyBehavior()
     QCOMPARE(x, qreal(200));    //should change immediately
 }
 
-void tst_behaviors::nonSelectingBehavior()
+void tst_qmlbehaviors::explicitSelection()
 {
     {
         QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting.qml"));
+        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/explicit.qml"));
         QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
+        QTest::qWait(100);
         qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-        QCOMPARE(x, qreal(200));    //should change immediately
+        QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
     }
+}
 
+void tst_qmlbehaviors::nonSelectingBehavior()
+{
     {
         QmlEngine engine;
         QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting2.qml"));
@@ -250,7 +256,7 @@ void tst_behaviors::nonSelectingBehavior()
     }
 }
 
-void tst_behaviors::reassignedAnimation()
+void tst_qmlbehaviors::reassignedAnimation()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
@@ -262,7 +268,7 @@ void tst_behaviors::reassignedAnimation()
                      rect->findChild<QmlBehavior*>("MyBehavior"))->animation())->duration(), 200);
 }
 
-void tst_behaviors::disabled()
+void tst_qmlbehaviors::disabled()
 {
     QmlEngine engine;
     QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
@@ -273,9 +279,23 @@ void tst_behaviors::disabled()
     rect->setState("moved");
     qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
     QCOMPARE(x, qreal(200));    //should change immediately
+}
+
+void tst_qmlbehaviors::dontStart()
+{
+    QmlEngine engine;
+
+    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
+
+    QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QVERIFY(rect);
 
+    QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+    QVERIFY(myAnim && myAnim->qtAnimation());
+    QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
 }
 
-QTEST_MAIN(tst_behaviors)
+QTEST_MAIN(tst_qmlbehaviors)
 
 #include "tst_qmlbehaviors.moc"