Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/qml/debugger/qv4debugservice.cpp
	src/qml/jsruntime/qv4value_inl_p.h
	src/qml/jsruntime/qv4value_p.h
	src/qml/memory/qv4mm.cpp
	src/qml/memory/qv4mm_p.h
	src/qml/qml/qqmlnotifier_p.h
	src/qml/qml/qqmlproperty.cpp
	src/quick/items/qquickflickable.cpp
	src/quick/items/qquicktextedit.cpp
	tests/auto/quick/qquickwindow/BLACKLIST

The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.

Change-Id: I16d1920abf448c29a01822256f52153651a56356

9 files changed, 51 insertions, 16 deletions

diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro
index 6543aa1b2b..3d821fc13d 100644
--- a/tests/auto/quick/examples/examples.pro
+++ b/tests/auto/quick/examples/examples.pro
@@ -10,3 +10,5 @@ CONFIG += parallel_test
 #temporary
 QT += core-private gui-private qml-private quick-private  testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+!qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS
+
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 175955d663..90c78ec942 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -104,7 +104,9 @@ tst_examples::tst_examples()
     excludedDirs << "demos/twitter";
     excludedDirs << "demos/flickr";
     excludedDirs << "demos/photoviewer";
-    excludedDirs << "snippets/qml/xmlrole.qml";
+    excludedFiles << "snippets/qml/xmlrole.qml";
+    excludedFiles << "particles/itemparticle/particleview.qml";
+    excludedFiles << "views/visualdatamodel/slideshow.qml";
 #endif
 
 }
diff --git a/tests/auto/quick/nodes/tst_nodestest.cpp b/tests/auto/quick/nodes/tst_nodestest.cpp
index b49ce34951..c49f01d5a7 100644
--- a/tests/auto/quick/nodes/tst_nodestest.cpp
+++ b/tests/auto/quick/nodes/tst_nodestest.cpp
@@ -283,7 +283,7 @@ void NodesTest::textureNodeTextureOwnership()
         QVERIFY(!texture.isNull());
     }
 
-    { // Check that it is deleted when we so desire
+    { // Check that it is deleted on destruction when we so desire
         QPointer<QSGTexture> texture(new QSGPlainTexture());
 
         QSGSimpleTextureNode *tn = new QSGSimpleTextureNode();
@@ -294,6 +294,25 @@ void NodesTest::textureNodeTextureOwnership()
         delete tn;
         QVERIFY(texture.isNull());
     }
+
+    { // Check that it is deleted on update when we so desire
+        QPointer<QSGTexture> oldTexture(new QSGPlainTexture());
+        QPointer<QSGTexture> newTexture(new QSGPlainTexture());
+
+        QSGSimpleTextureNode *tn = new QSGSimpleTextureNode();
+        tn->setOwnsTexture(true);
+        QVERIFY(tn->ownsTexture());
+
+        tn->setTexture(oldTexture);
+        QVERIFY(!oldTexture.isNull());
+        QVERIFY(!newTexture.isNull());
+
+        tn->setTexture(newTexture);
+        QVERIFY(oldTexture.isNull());
+        QVERIFY(!newTexture.isNull());
+
+        delete tn;
+    }
 }
 
 void NodesTest::textureNodeRect()
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
index 87cba880af..cd0f95bc7a 100644
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
@@ -24,7 +24,7 @@ Rectangle {
     name:"AnimationController"
     when:windowShown
     function test_parallelAnimation_data() {
-       //FIXME:the commented lines fail on MAC OS X
+       //FIXME:the commented lines fail on OS X
        return [
               {tag:"0.1",progress:0.1, x:5, y:10, color:"#e50019", width:14, height:14},
               //{tag:"0.2",progress:0.2, x:10, y:20, color:"#cb0033", width:18, height:18},
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
index 5960e53557..93f85107a7 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
@@ -677,5 +677,27 @@ CanvasTestCase {
         waitForRendering(implicitlySizedItem);
         comparePixel(implicitlySizedItem.canvas.context, xCenter, yCenter, 0, 0, 0, 255);
     }
+
+    Component {
+        id: simpleTextureNodeUsageComponent
+
+        Canvas {
+            id: canvas
+            anchors.fill: parent
+
+            onPaint: {
+                var ctx = canvas.getContext("2d");
+                ctx.clearRect(0, 0, 200, 200);
+            }
+        }
+    }
+
+    function test_simpleTextureNodeUsage() {
+        var canvas = simpleTextureNodeUsageComponent.createObject(container);
+        verify(canvas);
+        wait(0);
+        // Shouldn't crash.
+        canvas.requestPaint();
+    }
 }
 }
diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
index 95e495a74e..4678f5fbb9 100644
--- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
+++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
@@ -153,6 +153,8 @@ void tst_qquickstyledtext::textOutput_data()
     QTest::newRow("space trailing bold") << "this is <b>bold </b>" << "this is bold " << (FormatList() << Format(Format::Bold, 8, 5)) << false;
     QTest::newRow("img") << "a<img src=\"blah.png\"/>b" << "a  b" << FormatList() << false;
     QTest::newRow("tag mix") << "<f6>ds<b></img><pro>gfh</b><w><w>ghj</stron><ql><sl><pl>dfg</j6><img><bol><r><prp>dfg<bkj></b><up><string>ewrq</al><bl>jklhj<zl>" << "dsgfhghjdfgdfgewrqjklhj" << (FormatList() << Format(Format::Bold, 2, 3)) << false;
+    QTest::newRow("named html entities") << "&gt; &lt; &amp; &quot; &nbsp;" << QLatin1String("> < & \" ") + QChar(QChar::Nbsp) << FormatList() << false;
+    QTest::newRow("invalid html entities") << "a &hello & a &goodbye;" << "a &hello & a " << FormatList() << false;
 }
 
 void tst_qquickstyledtext::textOutput()
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 9682070162..079f73ae34 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -2419,7 +2419,7 @@ void tst_qquicktextinput::navigation()
     simulateKey(&window, Qt::Key_Left);
     QVERIFY(input->hasActiveFocus());
 
-    // Up and Down should NOT do Home/End, even on Mac OS X (QTBUG-10438).
+    // Up and Down should NOT do Home/End, even on OS X (QTBUG-10438).
     input->setCursorPosition(2);
     QCOMPARE(input->cursorPosition(),2);
     simulateKey(&window, Qt::Key_Up);
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
deleted file mode 100644
index 8a19a679a3..0000000000
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-[cursor]
-*
-[testWindowVisibilityOrder]
-osx
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 2c7a3c933b..e1ea068a62 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -1753,14 +1753,6 @@ void tst_qquickwindow::testWindowVisibilityOrder()
     QTest::qWaitForWindowExposed(window5);
     QVERIFY(window4->isVisible());
     QVERIFY(window5->isVisible());
-    window4->hide();
-    window5->hide();
-
-    window3->hide();
-    QTRY_COMPARE(window2, QGuiApplication::focusWindow());
-
-    window2->hide();
-    QTRY_COMPARE(window1.data(), QGuiApplication::focusWindow());
 }
 
 void tst_qquickwindow::blockClosing()