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>

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml b/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml
new file mode 100644
index 0000000000..923922c55a
--- /dev/null
+++ b/tests/auto/qml/qqmlvaluetypes/data/conflicting.1.qml
@@ -0,0 +1,42 @@
+import QtQuick 2.0
+
+Rectangle {
+    id: root
+
+    width: 800
+    height: 600
+
+    property alias font: myText.font
+
+    property int myPixelSize: 12
+    property int myPixelSize2: 24
+    
+    Text {
+        id: other
+        font.pixelSize: 6
+    }
+
+    Text {
+        id: myText
+
+        text: "Hello world!"
+        font.pixelSize: myPixelSize
+    }
+
+    states: State {
+        name: "Swapped"
+        PropertyChanges {
+            target: myText
+            font: other.font
+        }
+    }
+
+    function toggle() {
+        if (root.state == "") root.state = "Swapped"; else root.state = "";
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: { if (root.state == "") root.state = "Swapped"; else root.state = "";}
+    }
+}