Merge branch 'master' into refactor

Conflicts:
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgitem.cpp
	src/declarative/items/qsgtextnode.cpp
	tests/auto/declarative/examples/examples.pro
	tools/qmlviewer/qmlviewer.pro

Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10

8 files changed, 224 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml
new file mode 100644
index 0000000000..9135e79469
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/AliasPropertyComponent.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+    id: apc
+    property alias sourceComponent: loader.sourceComponent
+
+    Component {
+        id: redSquare
+        Rectangle { color: "red"; width: 10; height: 10 }
+    }
+
+    Loader {
+        id: loader
+        objectName: "loader"
+        sourceComponent: redSquare
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml
new file mode 100644
index 0000000000..a27c16dd2e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.1.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+Item {
+    id: first
+    property bool aliasIsUndefined: false
+    property alias sourceComponentAlias: loader.sourceComponent
+
+    Component {
+        id: redSquare
+        Rectangle { color: "red"; width: 10; height: 10 }
+    }
+
+    Loader {
+        id: loader
+        sourceComponent: redSquare
+    }
+
+    function resetAliased() {
+        loader.sourceComponent = undefined;
+        aliasIsUndefined = (sourceComponentAlias == undefined);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml
new file mode 100644
index 0000000000..fa2bb5eb6d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.2.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+Item {
+    id: first
+    property bool loaderSourceComponentIsUndefined: false
+    property alias sourceComponentAlias: loader.sourceComponent
+
+    Component {
+        id: redSquare
+        Rectangle { color: "red"; width: 10; height: 10 }
+    }
+
+    Loader {
+        id: loader
+        sourceComponent: redSquare
+    }
+
+    function resetAlias() {
+        sourceComponentAlias = undefined;
+        loaderSourceComponentIsUndefined = (loader.sourceComponent == undefined);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml
new file mode 100644
index 0000000000..4fa6861b08
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.3.qml
@@ -0,0 +1,31 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+Item {
+    id: first
+    property bool loaderTwoSourceComponentIsUndefined: false
+    property bool loaderOneSourceComponentIsUndefined: false
+    property alias sourceComponentAlias: loaderOne.sourceComponent
+
+    Component {
+        id: redSquare
+        Rectangle { color: "red"; width: 10; height: 10 }
+    }
+
+    Loader {
+        id: loaderOne
+        sourceComponent: loaderTwo.sourceComponent
+    }
+
+    Loader {
+        id: loaderTwo
+        sourceComponent: redSquare
+        x: 15
+    }
+
+    function resetAlias() {
+        sourceComponentAlias = undefined; // loaderOne.sourceComponent should be set to undefined instead of l2.sc
+        loaderOneSourceComponentIsUndefined = (loaderOne.sourceComponent == undefined); // should be true
+        loaderTwoSourceComponentIsUndefined = (loaderTwo.sourceComponent == undefined); // should be false
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml
new file mode 100644
index 0000000000..56fcc2ec7c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.4.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+Item {
+    id: first
+    property alias sourceComponentAlias: loader.sourceComponent
+
+    Component {
+        id: redSquare
+        Rectangle { color: "red"; width: 10; height: 10 }
+    }
+
+    Loader {
+        id: loader
+        objectName: "loader"
+        sourceComponent: redSquare
+    }
+
+    function resetAlias() {
+        sourceComponentAlias = undefined; // ensure we don't crash after deletion of loader.
+    }
+
+    function setAlias() {
+        sourceComponentAlias = redSquare;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml
new file mode 100644
index 0000000000..a046bbf504
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.5.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+Item {
+    id: root
+
+    AliasPropertyComponent {
+        sourceComponent: returnsUndefined()
+    }
+
+    function returnsUndefined() {
+        return undefined;
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml
new file mode 100644
index 0000000000..22311d6bb3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasreset/aliasPropertyReset.error.1.qml
@@ -0,0 +1,18 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+MyQmlObject {
+    id: first
+    property bool aliasedIntIsUndefined: false
+    property alias intAlias: objprop.intp
+
+    objectProperty: QtObject {
+        id: objprop
+        property int intp: 12
+    }
+
+    function resetAlias() {
+        intAlias = undefined; // should error
+        aliasedIntIsUndefined = (objprop.intp == undefined);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml
new file mode 100644
index 0000000000..12598b3b9f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/declarativeHasOwnProperty.qml
@@ -0,0 +1,72 @@
+import QtQuick 2.0
+import Qt.test 1.0
+import Qt.test.qobjectApi 1.0 as QtTestQObjectApi
+
+Item {
+    id: obj
+    objectName: "objName"
+    property int someIntProperty: 10
+    property bool result: false
+
+    function testHasOwnPropertySuccess()
+    {
+        obj.result = obj.hasOwnProperty("someIntProperty");
+    }
+
+    function testHasOwnPropertyFailure()
+    {
+        obj.result = obj.hasOwnProperty("someNonexistentProperty");
+    }
+
+    MyTypeObject {
+        id: typeObj
+        objectName: "typeObj"
+        pointProperty: Qt.point(34, 29)
+        variantProperty: Qt.vector3d(1, 2, 3)
+        stringProperty: "test string"
+        property list<Rectangle> listProperty: [ Rectangle { width: 10; height: 10 } ]
+        property list<Rectangle> emptyListProperty
+
+        property bool valueTypeHasOwnProperty
+        property bool valueTypeHasOwnProperty2
+        property bool variantTypeHasOwnProperty
+        property bool stringTypeHasOwnProperty
+        property bool listTypeHasOwnProperty
+        property bool listAtValidHasOwnProperty
+        property bool emptyListTypeHasOwnProperty
+        property bool enumTypeHasOwnProperty
+        property bool typenameHasOwnProperty
+        property bool typenameHasOwnProperty2
+        property bool moduleApiTypeHasOwnProperty
+        property bool moduleApiPropertyTypeHasOwnProperty
+        function testHasOwnPropertySuccess() {
+            valueTypeHasOwnProperty = !typeObj.pointProperty.hasOwnProperty("nonexistentpropertyname");
+            valueTypeHasOwnProperty2 = typeObj.pointProperty.hasOwnProperty("x"); // should be true
+            variantTypeHasOwnProperty = !typeObj.variantProperty.hasOwnProperty("nonexistentpropertyname");
+            stringTypeHasOwnProperty = !typeObj.stringProperty.hasOwnProperty("nonexistentpropertyname");
+            listTypeHasOwnProperty = !typeObj.listProperty.hasOwnProperty("nonexistentpropertyname");
+            listAtValidHasOwnProperty = !typeObj.listProperty[0].hasOwnProperty("nonexistentpropertyname");
+            emptyListTypeHasOwnProperty = !typeObj.emptyListProperty.hasOwnProperty("nonexistentpropertyname");
+            enumTypeHasOwnProperty = !MyTypeObject.EnumVal1.hasOwnProperty("nonexistentpropertyname");
+            typenameHasOwnProperty = !MyTypeObject.hasOwnProperty("nonexistentpropertyname");
+            typenameHasOwnProperty2 = MyTypeObject.hasOwnProperty("EnumVal1"); // should be true.
+            moduleApiTypeHasOwnProperty = !QtTestQObjectApi.hasOwnProperty("nonexistentpropertyname");
+            moduleApiPropertyTypeHasOwnProperty = !QtTestQObjectApi.qobjectTestProperty.hasOwnProperty("nonexistentpropertyname");
+        }
+
+        property bool enumNonValueHasOwnProperty
+        function testHasOwnPropertyFailureOne() {
+            enumNonValueHasOwnProperty = !MyTypeObject.NonexistentEnumVal.hasOwnProperty("nonexistentpropertyname");
+        }
+
+        property bool moduleApiNonPropertyHasOwnProperty
+        function testHasOwnPropertyFailureTwo() {
+            moduleApiNonPropertyHasOwnProperty = !QtTestQObjectApi.someNonexistentProperty.hasOwnProperty("nonexistentpropertyname");
+        }
+
+        property bool listAtInvalidHasOwnProperty
+        function testHasOwnPropertyFailureThree() {
+            listAtInvalidHasOwnProperty = !typeObj.listProperty[5].hasOwnProperty("nonexistentpropertyname");
+        }
+    }
+}