aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlproperty/data
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-02-16 14:43:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-24 04:51:31 +0100
commitb855240b782395f94315f43ea3e7e182299fac48 (patch)
treebc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/qml/qqmlproperty/data
parent6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
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>
Diffstat (limited to 'tests/auto/qml/qqmlproperty/data')
-rw-r--r--tests/auto/qml/qqmlproperty/data/NoContextTypeA.qml5
-rw-r--r--tests/auto/qml/qqmlproperty/data/NoContextTypeB.qml5
-rw-r--r--tests/auto/qml/qqmlproperty/data/TestType.qml6
-rw-r--r--tests/auto/qml/qqmlproperty/data/aliasPropertyBindings.qml19
-rw-r--r--tests/auto/qml/qqmlproperty/data/assignEmptyVariantMap.qml5
-rw-r--r--tests/auto/qml/qqmlproperty/data/readSynthesizedObject.qml9
6 files changed, 49 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlproperty/data/NoContextTypeA.qml b/tests/auto/qml/qqmlproperty/data/NoContextTypeA.qml
new file mode 100644
index 0000000000..f58967cbb2
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/NoContextTypeA.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+QtObject {
+ property string someString
+}
diff --git a/tests/auto/qml/qqmlproperty/data/NoContextTypeB.qml b/tests/auto/qml/qqmlproperty/data/NoContextTypeB.qml
new file mode 100644
index 0000000000..4b3672873d
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/NoContextTypeB.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+QtObject {
+ property NoContextTypeA myTypeA
+}
diff --git a/tests/auto/qml/qqmlproperty/data/TestType.qml b/tests/auto/qml/qqmlproperty/data/TestType.qml
new file mode 100644
index 0000000000..1fe150548a
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/TestType.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+QtObject {
+ property int a: 10
+}
+
diff --git a/tests/auto/qml/qqmlproperty/data/aliasPropertyBindings.qml b/tests/auto/qml/qqmlproperty/data/aliasPropertyBindings.qml
new file mode 100644
index 0000000000..f101f38a2d
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/aliasPropertyBindings.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+
+Item {
+ id: root
+
+ property real test: 9
+ property real test2: 3
+
+ property real realProperty: test * test + test
+ property alias aliasProperty: root.realProperty
+
+ states: State {
+ name: "switch"
+ PropertyChanges {
+ target: root
+ aliasProperty: 32 * test2
+ }
+ }
+}
diff --git a/tests/auto/qml/qqmlproperty/data/assignEmptyVariantMap.qml b/tests/auto/qml/qqmlproperty/data/assignEmptyVariantMap.qml
new file mode 100644
index 0000000000..a9e51c1255
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/assignEmptyVariantMap.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+Item {
+ Component.onCompleted: { o.variantMap = {}; }
+}
diff --git a/tests/auto/qml/qqmlproperty/data/readSynthesizedObject.qml b/tests/auto/qml/qqmlproperty/data/readSynthesizedObject.qml
new file mode 100644
index 0000000000..55010b69a9
--- /dev/null
+++ b/tests/auto/qml/qqmlproperty/data/readSynthesizedObject.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+
+QtObject {
+ property TestType test
+
+ test: TestType {
+ property int b: 19
+ }
+}