Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>

4 files changed, 47 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlinfo/data/NestedComponent.qml b/tests/auto/qml/qqmlinfo/data/NestedComponent.qml
new file mode 100644
index 0000000000..cfe47589df
--- /dev/null
+++ b/tests/auto/qml/qqmlinfo/data/NestedComponent.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.0
+
+QtObject {
+    property variant nested
+    property variant nested2: nested.nested
+
+    property variant component
+    component: Component {
+        id: myComponent
+        NestedObject { property string testProp: "test" }
+    }
+
+    property variant component2
+    component2: Component {
+        id: myComponent2
+        Image { property string testProp: "test" }
+    }
+
+    Component.onCompleted: {
+        nested = myComponent.createObject(0);
+        nested2 = myComponent2.createObject(0);
+    }
+}
diff --git a/tests/auto/qml/qqmlinfo/data/NestedObject.qml b/tests/auto/qml/qqmlinfo/data/NestedObject.qml
new file mode 100644
index 0000000000..4b19b11699
--- /dev/null
+++ b/tests/auto/qml/qqmlinfo/data/NestedObject.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+QtObject {
+    property variant nested
+
+    nested:  QtObject {}
+}
+
diff --git a/tests/auto/qml/qqmlinfo/data/nestedQmlObject.qml b/tests/auto/qml/qqmlinfo/data/nestedQmlObject.qml
new file mode 100644
index 0000000000..d199a612c4
--- /dev/null
+++ b/tests/auto/qml/qqmlinfo/data/nestedQmlObject.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+QtObject {
+    property variant nested
+    nested: NestedObject { }
+    property variant nested2: nested.nested
+}
+
diff --git a/tests/auto/qml/qqmlinfo/data/qmlObject.qml b/tests/auto/qml/qqmlinfo/data/qmlObject.qml
new file mode 100644
index 0000000000..6a8e2fbc90
--- /dev/null
+++ b/tests/auto/qml/qqmlinfo/data/qmlObject.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+QtObject {
+    property variant nested
+
+    nested: QtObject {
+    }
+}