diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 01:34:16 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 01:34:16 (GMT) |
commit | ce85fb709170faa91664d822cb2e0cf271ecbeb4 (patch) | |
tree | b1f4f7c9e111bb8543d922020c144ba6113a3b6c | |
parent | 93e65f89fa103aa8fb243ddd174657f7fa351644 (diff) | |
download | Qt-ce85fb709170faa91664d822cb2e0cf271ecbeb4.zip Qt-ce85fb709170faa91664d822cb2e0cf271ecbeb4.tar.gz Qt-ce85fb709170faa91664d822cb2e0cf271ecbeb4.tar.bz2 |
Fix imports.
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..9603805 100644 --- a/tests/auto/declarative/qmlbindengine/bindingLoop.txt +++ b/tests/auto/declarative/qmlbindengine/bindingLoop.txt @@ -1,3 +1,5 @@ +import 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..df14f4a 100644 --- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt +++ b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt @@ -1,3 +1,5 @@ +import 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..6a7b865 100644 --- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt +++ b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt @@ -1,3 +1,5 @@ +import 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..ac0a6c8 100644 --- a/tests/auto/declarative/qmlbindengine/deferredProperties.txt +++ b/tests/auto/declarative/qmlbindengine/deferredProperties.txt @@ -1,3 +1,5 @@ +import 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..1342779 100644 --- a/tests/auto/declarative/qmlbindengine/extensionObjects.txt +++ b/tests/auto/declarative/qmlbindengine/extensionObjects.txt @@ -1,3 +1,5 @@ +import 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..65bc335 100644 --- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt +++ b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt @@ -1,3 +1,6 @@ +import 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..f6f2e0a 100644 --- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt +++ b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt @@ -1,3 +1,6 @@ +import 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..df4354f 100644 --- a/tests/auto/declarative/qmlbindengine/methods.1.txt +++ b/tests/auto/declarative/qmlbindengine/methods.1.txt @@ -1,3 +1,5 @@ +import 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..b75ed28 100644 --- a/tests/auto/declarative/qmlbindengine/methods.2.txt +++ b/tests/auto/declarative/qmlbindengine/methods.2.txt @@ -1,3 +1,5 @@ +import 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..511db74 100644 --- a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt +++ b/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt @@ -1,3 +1,5 @@ +import 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..eb913d1 100644 --- a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt +++ b/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt @@ -1,3 +1,5 @@ +import 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..e094fd1 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(Test,1,0,0,MyQmlObject,MyQmlObject); +QML_DEFINE_TYPE(Test,1,0,0,MyDeferredObject,MyDeferredObject); +QML_DEFINE_TYPE(Test,1,0,0,MyQmlContainer,MyQmlContainer); +QML_DEFINE_EXTENDED_TYPE(Test,1,0,0,MyBaseExtendedObject,MyBaseExtendedObject,BaseExtensionObject); +QML_DEFINE_EXTENDED_TYPE(Test,1,0,0,MyExtendedObject,MyExtendedObject,ExtensionObject); #include "testtypes.moc" |