summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qmlbindengine/bindingLoop.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/deferredProperties.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/extensionObjects.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt3
-rw-r--r--tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt3
-rw-r--r--tests/auto/declarative/qmlbindengine/methods.1.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/methods.2.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/signalAssignment.1.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/signalAssignment.2.txt2
-rw-r--r--tests/auto/declarative/qmlbindengine/testtypes.cpp10
12 files changed, 29 insertions, 5 deletions
diff --git a/tests/auto/declarative/qmlbindengine/bindingLoop.txt b/tests/auto/declarative/qmlbindengine/bindingLoop.txt
index e27a76c..8b22dd1 100644
--- a/tests/auto/declarative/qmlbindengine/bindingLoop.txt
+++ b/tests/auto/declarative/qmlbindengine/bindingLoop.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlContainer {
children : [
MyQmlObject {
diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt
index 7368ff6..3147f63 100644
--- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt
+++ b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
stringProperty: trueProperty?'pass':'fail'
}
diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt
index c74493e..c89bb49 100644
--- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt
+++ b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
stringProperty: falseProperty?'fail':'pass'
}
diff --git a/tests/auto/declarative/qmlbindengine/deferredProperties.txt b/tests/auto/declarative/qmlbindengine/deferredProperties.txt
index 41aa891..9dabafe 100644
--- a/tests/auto/declarative/qmlbindengine/deferredProperties.txt
+++ b/tests/auto/declarative/qmlbindengine/deferredProperties.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyDeferredObject {
value: 10
objectProperty: MyQmlObject {}
diff --git a/tests/auto/declarative/qmlbindengine/extensionObjects.txt b/tests/auto/declarative/qmlbindengine/extensionObjects.txt
index 4c33de4..a902312 100644
--- a/tests/auto/declarative/qmlbindengine/extensionObjects.txt
+++ b/tests/auto/declarative/qmlbindengine/extensionObjects.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyExtendedObject
{
baseProperty: baseExtendedProperty
diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt
index 2687465..ccb3a22 100644
--- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt
+++ b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt
@@ -1,3 +1,6 @@
+import Qt.test 1.0
+import Qt 4.6
+
MyQmlObject {
objectProperty: if(1) OtherObject
diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt
index 4aa20ae..6c1fca6 100644
--- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt
+++ b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt
@@ -1,3 +1,6 @@
+import Qt.test 1.0
+import Qt 4.6
+
MyQmlObject {
objectProperty: OtherObject
diff --git a/tests/auto/declarative/qmlbindengine/methods.1.txt b/tests/auto/declarative/qmlbindengine/methods.1.txt
index 35279e0..8ba300f 100644
--- a/tests/auto/declarative/qmlbindengine/methods.1.txt
+++ b/tests/auto/declarative/qmlbindengine/methods.1.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
id: MyObject
onBasicSignal: MyObject.method()
diff --git a/tests/auto/declarative/qmlbindengine/methods.2.txt b/tests/auto/declarative/qmlbindengine/methods.2.txt
index 352913a..70911f7 100644
--- a/tests/auto/declarative/qmlbindengine/methods.2.txt
+++ b/tests/auto/declarative/qmlbindengine/methods.2.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
id: MyObject
onBasicSignal: MyObject.method(163)
diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt b/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt
index ca682fa..fbd0914 100644
--- a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt
+++ b/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
onBasicSignal: setString('pass')
}
diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt b/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt
index 5efd583..8addcb9 100644
--- a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt
+++ b/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt
@@ -1,3 +1,5 @@
+import Qt.test 1.0
+
MyQmlObject {
onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c)
}
diff --git a/tests/auto/declarative/qmlbindengine/testtypes.cpp b/tests/auto/declarative/qmlbindengine/testtypes.cpp
index 2f83f58..6122186 100644
--- a/tests/auto/declarative/qmlbindengine/testtypes.cpp
+++ b/tests/auto/declarative/qmlbindengine/testtypes.cpp
@@ -32,10 +32,10 @@ private:
int m_value;
};
-QML_DEFINE_TYPE(MyQmlObject,MyQmlObject);
-QML_DEFINE_TYPE(MyDeferredObject,MyDeferredObject);
-QML_DEFINE_TYPE(MyQmlContainer,MyQmlContainer);
-QML_DEFINE_EXTENDED_TYPE(MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
-QML_DEFINE_EXTENDED_TYPE(MyExtendedObject,MyExtendedObject,ExtensionObject);
+QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyQmlObject,MyQmlObject);
+QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyDeferredObject,MyDeferredObject);
+QML_DEFINE_TYPE(Qt/test, 1, 0, 0, MyQmlContainer,MyQmlContainer);
+QML_DEFINE_EXTENDED_TYPE(Qt/test, 1, 0, 0, MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject);
+QML_DEFINE_EXTENDED_TYPE(Qt/test, 1, 0, 0, MyExtendedObject,MyExtendedObject,ExtensionObject);
#include "testtypes.moc"