Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/debugger/qqmlprofiler_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/memory/qv4mm.cpp
	src/qml/qml/qqmlcomponent.cpp
	src/qml/qml/qqmlobjectcreator.cpp
	src/qml/qml/qqmlobjectcreator_p.h
	src/qml/types/qqmldelegatemodel.cpp
	src/quick/items/qquickitem_p.h
	src/quick/items/qquickwindow.cpp
	tests/auto/quick/touchmouse/BLACKLIST
	tests/benchmarks/qml/holistic/tst_holistic.cpp

Change-Id: I520f349ab4b048dd337d9647113564fc257865c2

1 files changed, 25 insertions, 21 deletions

diff --git a/examples/quick/externaldraganddrop/DragAndDropTextItem.qml b/examples/quick/externaldraganddrop/DragAndDropTextItem.qml
index 7499c83e6d..9858a961c9 100644
--- a/examples/quick/externaldraganddrop/DragAndDropTextItem.qml
+++ b/examples/quick/externaldraganddrop/DragAndDropTextItem.qml
@@ -49,32 +49,36 @@
 ****************************************************************************/
 
 import QtQuick 2.2
+import "../shared" as Examples
 
 Rectangle {
     id: item
     property string display
-    color: "#EEE"
+    property alias dropEnabled: acceptDropCB.checked
+    color: dropArea.containsDrag ? "#CFC" : "#EEE"
+    ColorAnimation on color {
+        id: rejectAnimation
+        from: "#FCC"
+        to: "#EEE"
+        duration: 1000
+    }
     Text {
         anchors.fill: parent
         text: item.display
         wrapMode: Text.WordWrap
     }
     DropArea {
+        id: dropArea
         anchors.fill: parent
         keys: ["text/plain"]
-        onEntered: {
-            item.color = "#FCC"
-        }
-        onExited: {
-            item.color = "#EEE"
+        onEntered: if (!acceptDropCB.checked) {
+            drag.accepted = false
+            rejectAnimation.start()
         }
-        onDropped: {
-            item.color = "#EEE"
-            if (drop.hasText) {
-                if (drop.proposedAction == Qt.MoveAction || drop.proposedAction == Qt.CopyAction) {
-                    item.display = drop.text
-                    drop.acceptProposedAction()
-                }
+        onDropped: if (drop.hasText && acceptDropCB.checked) {
+            if (drop.proposedAction == Qt.MoveAction || drop.proposedAction == Qt.CopyAction) {
+                item.display = drop.text
+                drop.acceptProposedAction()
             }
         }
     }
@@ -91,12 +95,12 @@ Rectangle {
         Drag.hotSpot.y: 0
         Drag.mimeData: { "text/plain": item.display }
         Drag.dragType: Drag.Automatic
-        Drag.onDragStarted: {
-        }
-        Drag.onDragFinished: {
-            if (dropAction == Qt.MoveAction) {
-                item.display = ""
-            }
-        }
-    } // Item
+        Drag.onDragFinished: if (dropAction == Qt.MoveAction) item.display = ""
+    }
+    Examples.CheckBox {
+        id: acceptDropCB
+        anchors.right: parent.right
+        checked: true
+        text: "accept drop"
+    }
 }