Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1

Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033

14 files changed, 76 insertions, 53 deletions

diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 22dfff703e..ef51d98d44 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -37,7 +37,7 @@ qtConfig(opengl(es1|es2)?) {
 # Widget dependent examples
 qtHaveModule(widgets) {
     SUBDIRS += embeddedinwidgets
-    qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
+    qtHaveModule(quickwidgets):qtConfig(opengl(es1|es2)?): SUBDIRS += quickwidgets
 }
 
 EXAMPLE_FILES = \
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index c748161ee8..54a556b783 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -174,7 +174,6 @@ function, passing a QVariantList and a QVariantMap, which are automatically
 converted to JavaScript array and object values, repectively:
 
 \table
-\header
 \row
 \li QML
 \li \snippet qml/qtbinding/variantlistmap/MyItem.qml 0
@@ -213,7 +212,6 @@ a \c Date object that is automatically converted into a QDateTime value when it
 is received in C++:
 
 \table
-\header
 \row
 \li QML
 \li
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index ea5e9c0904..891db5eb3f 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -112,6 +112,8 @@ public:
             if (it->m_propertyIndex == propertyIndex)
                 return true;
         }
+        if (auto parentInterceptor = ((parent.isT1() && parent.flag()) ? static_cast<QQmlInterceptorMetaObject *>(parent.asT1()) : 0))
+            return parentInterceptor->intercepts(propertyIndex);
         return false;
     }
 
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index d088a5da42..d72d2e9487 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -341,7 +341,9 @@ ListModel::ListModel(ListLayout *layout, QQmlListModel *modelCache, int uid) : m
 
 void ListModel::destroy()
 {
-    clear();
+    for (const auto &destroyer : remove(0, elements.count()))
+        destroyer();
+
     m_uid = -1;
     m_layout = 0;
     if (m_modelCache && m_modelCache->m_primary == false)
@@ -562,16 +564,6 @@ void ListModel::set(int elementIndex, QV4::Object *object)
     }
 }
 
-void ListModel::clear()
-{
-    int elementCount = elements.count();
-    for (int i=0 ; i < elementCount ; ++i) {
-        elements[i]->destroy(m_layout);
-        delete elements[i];
-    }
-    elements.clear();
-}
-
 QVector<std::function<void()>> ListModel::remove(int index, int count)
 {
     QVector<std::function<void()>> toDestroy;
@@ -2031,18 +2023,7 @@ int QQmlListModel::count() const
 */
 void QQmlListModel::clear()
 {
-    const int cleared = count();
-
-    emitItemsAboutToBeRemoved(0, cleared);
-
-    if (m_dynamicRoles) {
-        qDeleteAll(m_modelObjects);
-        m_modelObjects.clear();
-    } else {
-        m_listModel->clear();
-    }
-
-    emitItemsRemoved(0, cleared);
+    removeElements(0, count());
 }
 
 /*!
@@ -2066,27 +2047,32 @@ void QQmlListModel::remove(QQmlV4Function *args)
             return;
         }
 
-        emitItemsAboutToBeRemoved(index, removeCount);
+        removeElements(index, removeCount);
+    } else {
+        qmlWarning(this) << tr("remove: incorrect number of arguments");
+    }
+}
 
-        QVector<std::function<void()>> toDestroy;
-        if (m_dynamicRoles) {
-            for (int i=0 ; i < removeCount ; ++i) {
-                auto modelObject = m_modelObjects[index+i];
-                toDestroy.append([modelObject](){
-                    delete modelObject;
-                });
-            }
-            m_modelObjects.remove(index, removeCount);
-        } else {
-            toDestroy = m_listModel->remove(index, removeCount);
-        }
+void QQmlListModel::removeElements(int index, int removeCount)
+{
+    emitItemsAboutToBeRemoved(index, removeCount);
 
-        emitItemsRemoved(index, removeCount);
-        for (const auto &destroyer : toDestroy)
-            destroyer();
+    QVector<std::function<void()>> toDestroy;
+    if (m_dynamicRoles) {
+        for (int i=0 ; i < removeCount ; ++i) {
+            auto modelObject = m_modelObjects[index+i];
+            toDestroy.append([modelObject](){
+                delete modelObject;
+            });
+        }
+        m_modelObjects.remove(index, removeCount);
     } else {
-        qmlWarning(this) << tr("remove: incorrect number of arguments");
+        toDestroy = m_listModel->remove(index, removeCount);
     }
+
+    emitItemsRemoved(index, removeCount);
+    for (const auto &destroyer : toDestroy)
+        destroyer();
 }
 
 /*!
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index b750d30676..1fda703797 100644
--- a/src/qml/types/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
@@ -165,6 +165,8 @@ private:
     void emitItemsInserted(int index, int count);
     void emitItemsAboutToBeMoved(int from, int to, int n);
     void emitItemsMoved(int from, int to, int n);
+
+    void removeElements(int index, int removeCount);
 };
 
 // ### FIXME
diff --git a/src/qml/types/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h
index 77d2002afa..271437e680 100644
--- a/src/qml/types/qqmllistmodel_p_p.h
+++ b/src/qml/types/qqmllistmodel_p_p.h
@@ -366,7 +366,6 @@ public:
     int append(QV4::Object *object);
     void insert(int elementIndex, QV4::Object *object);
 
-    void clear();
     Q_REQUIRED_RESULT QVector<std::function<void()>> remove(int index, int count);
 
     int appendElement();
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 64d0169f6b..dcd0360199 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -72,7 +72,7 @@ public:
         int ref;
     };
 
-    QQmlObjectModelPrivate() : QObjectPrivate() {}
+    QQmlObjectModelPrivate() : QObjectPrivate(), moveId(0) {}
 
     static void children_append(QQmlListProperty<QObject> *prop, QObject *item) {
         int index = static_cast<QQmlObjectModelPrivate *>(prop->data)->children.count();
@@ -129,7 +129,7 @@ public:
         }
 
         QQmlChangeSet changeSet;
-        changeSet.move(from, to, n, 0);
+        changeSet.move(from, to, n, ++moveId);
         emit q->modelUpdated(changeSet, false);
         emit q->childrenChanged();
     }
@@ -166,7 +166,7 @@ public:
         return -1;
     }
 
-
+    uint moveId;
     QList<Item> children;
 };
 
diff --git a/src/quick/doc/snippets/qml/texteditor.qml b/src/quick/doc/snippets/qml/texteditor.qml
index 7da9086e10..9bf13fb27c 100644
--- a/src/quick/doc/snippets/qml/texteditor.qml
+++ b/src/quick/doc/snippets/qml/texteditor.qml
@@ -63,7 +63,6 @@ Flickable {
      TextEdit {
          id: edit
          width: flick.width
-         height: flick.height
          focus: true
          wrapMode: TextEdit.Wrap
          onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 9f27beb298..cd356a9eeb 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -852,6 +852,7 @@ qreal QQuickLoader::progress() const
 \qmlproperty bool QtQuick::Loader::asynchronous
 
 This property holds whether the component will be instantiated asynchronously.
+By default it is \c false.
 
 When used in conjunction with the \l source property, loading and compilation
 will also be performed in a background thread.
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 264b30b897..22d57001fc 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1079,6 +1079,7 @@ void QSGGeometryNode::setInheritedOpacity(qreal opacity)
 
 QSGClipNode::QSGClipNode()
     : QSGBasicGeometryNode(ClipNodeType)
+    , m_is_rectangular(false)
 {
     Q_UNUSED(m_reserved);
 }
@@ -1114,6 +1115,8 @@ QSGClipNode::~QSGClipNode()
 
     When this hint is set and it is applicable, the clip region will be
     generated from clipRect() rather than geometry().
+
+    By default this property is \c false.
  */
 
 void QSGClipNode::setIsRectangular(bool rectHint)
diff --git a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
index 6ac0412ae5..fb63d811a8 100644
--- a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
+++ b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
@@ -47,18 +47,18 @@ static bool compareItems(QQmlObjectModel *model, const QObjectList &items)
     return true;
 }
 
-static bool verifyChangeSet(const QQmlChangeSet &changeSet, int expectedInserts, int expectedRemoves, bool isMove)
+static bool verifyChangeSet(const QQmlChangeSet &changeSet, int expectedInserts, int expectedRemoves, bool isMove, int moveId = -1)
 {
     int actualRemoves = 0;
     for (const QQmlChangeSet::Change &r : changeSet.removes()) {
-        if (r.isMove() != isMove)
+        if (r.isMove() != isMove && (!isMove || moveId == r.moveId))
             return false;
         actualRemoves += r.count;
     }
 
     int actualInserts = 0;
     for (const QQmlChangeSet::Change &i : changeSet.inserts()) {
-        if (i.isMove() != isMove)
+        if (i.isMove() != isMove && (!isMove || moveId == i.moveId))
             return false;
         actualInserts += i.count;
     }
@@ -129,7 +129,7 @@ void tst_QQmlObjectModel::changes()
     QCOMPARE(countSpy.count(), countSignals);
     QCOMPARE(childrenSpy.count(), ++childrenSignals);
     QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals);
-    QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value<QQmlChangeSet>(), 1, 1, true));
+    QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value<QQmlChangeSet>(), 1, 1, true, 1));
 
     // move(3, 2) -> [item0, item1, item2, item3]
     model.move(3, 2); items.move(3, 2);
@@ -138,7 +138,7 @@ void tst_QQmlObjectModel::changes()
     QCOMPARE(countSpy.count(), countSignals);
     QCOMPARE(childrenSpy.count(), ++childrenSignals);
     QCOMPARE(modelUpdateSpy.count(), ++modelUpdateSignals);
-    QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value<QQmlChangeSet>(), 1, 1, true));
+    QVERIFY(verifyChangeSet(modelUpdateSpy.last().first().value<QQmlChangeSet>(), 1, 1, true, 2));
 
     // remove(0) -> [item1, item2, item3]
     model.remove(0); items.removeAt(0);
diff --git a/tests/auto/quick/qquickbehaviors/data/ItemWithInnerBehavior.qml b/tests/auto/quick/qquickbehaviors/data/ItemWithInnerBehavior.qml
new file mode 100644
index 0000000000..09983645ef
--- /dev/null
+++ b/tests/auto/quick/qquickbehaviors/data/ItemWithInnerBehavior.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.4
+
+Item {
+    id: root
+
+    property bool someValue
+    Behavior on someValue {
+        ScriptAction { script: { parent.behaviorTriggered = true }}
+    }
+}
diff --git a/tests/auto/quick/qquickbehaviors/data/overwrittenbehavior.qml b/tests/auto/quick/qquickbehaviors/data/overwrittenbehavior.qml
new file mode 100644
index 0000000000..e627c45782
--- /dev/null
+++ b/tests/auto/quick/qquickbehaviors/data/overwrittenbehavior.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.4
+
+Item {
+    property bool behaviorTriggered
+    property bool someProperty
+
+    ItemWithInnerBehavior {
+        //the existence of this property triggers the bug
+        property bool iDoAbsolutelyNothing
+
+        Component.onCompleted: parent.someProperty = true
+        someValue: parent.someProperty
+    }
+}
diff --git a/tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp b/tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp
index 80c76a377b..bdd53702e5 100644
--- a/tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp
+++ b/tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp
@@ -72,6 +72,7 @@ private slots:
     void currentValue();
     void disabledWriteWhileRunning();
     void aliasedProperty();
+    void innerBehaviorOverwritten();
 };
 
 void tst_qquickbehaviors::simpleBehavior()
@@ -589,6 +590,14 @@ void tst_qquickbehaviors::aliasedProperty()
     //i.e. the behavior has been triggered
 }
 
+void tst_qquickbehaviors::innerBehaviorOverwritten()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, testFileUrl("overwrittenbehavior.qml"));
+    QScopedPointer<QQuickItem> item(qobject_cast<QQuickItem*>(c.create()));
+    QVERIFY(item->property("behaviorTriggered").toBool());
+}
+
 QTEST_MAIN(tst_qquickbehaviors)
 
 #include "tst_qquickbehaviors.moc"