summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeloader/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/qdeclarativeloader/data')
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/NoResize.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml7
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/VmeError.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/crash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/nonItem.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml2
18 files changed, 22 insertions, 19 deletions
diff --git a/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml b/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
index 3b49f6a..f202fc8 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Rectangle {
objectName: "blue"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
index 4ebf366..9bb0b37 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
import Qt.widgets 4.6
QGraphicsWidget {
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml b/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
index 7ee3513..9b8f770 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 100; height: 100
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
index cfbb55a..6aa3d2f 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: "NoResize"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
index 5eab965..9322141 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: Loader.NoResize
diff --git a/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
index aa4b0c2..d808c51 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 120
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
index 1db56c4..d99dd01 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
@@ -1,6 +1,9 @@
-import Qt 4.6
+import Qt 4.7
Item {
+ function clear() {
+ loader.sourceComponent = undefined
+ }
Component { id: comp; Rectangle { width: 100; height: 50 } }
- Loader { sourceComponent: comp }
+ Loader { id: loader; sourceComponent: comp }
}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
index 568a136..0cfb4df 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: Loader.SizeItemToLoader
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
index a710803..b588c9d 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: Loader.SizeLoaderToItem
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
index b52fa03..93be6f1 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: "SizeLoaderToItem"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
index 1a107e1..04b46fb 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
resizeMode: "SizeItemToLoader"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml b/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
index da4f6cb..633f03d 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/VmeError.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 100; height: 100; color: "red"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/crash.qml b/tests/auto/declarative/qdeclarativeloader/data/crash.qml
index 8474e78..db9abca 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/crash.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/crash.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 400
diff --git a/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml b/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
index e682d1c..b32558b 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml
@@ -1,3 +1,3 @@
-import Qt 4.6
+import Qt 4.7
Loader { source: "http://evil.place/evil.qml" }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml b/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
index f42c1d5..5ce003d 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/nonItem.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
sourceComponent: QtObject {}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml b/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
index e281246..812c1be 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml
@@ -1,3 +1,3 @@
-import Qt 4.6
+import Qt 4.7
Item { }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml b/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
index e7f5a14..91732a1 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml
@@ -1,3 +1,3 @@
-import Qt 4.6
+import Qt 4.7
Loader { source: "sameorigin-load.qml" }
diff --git a/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml b/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
index 782562b..ae33e00 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml
@@ -1,4 +1,4 @@
-import Qt 4.6
+import Qt 4.7
Loader {
source: "VmeError.qml"