From 4442dea01b9d4d45964228ac442166d89f091f9e Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 11 Jul 2011 13:47:51 +1000 Subject: Extract all QtQuick 1 elements into a separate library/plugin. Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones --- tests/auto/declarative/qdeclarativelanguage/data/Alias.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml | 2 +- .../qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml | 2 +- .../qdeclarativelanguage/data/DynamicPropertiesNestedType.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml | 2 +- .../data/InlineAssignmentsOverrideBindingsType.qml | 2 +- .../data/InlineAssignmentsOverrideBindingsType2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml | 2 +- .../qdeclarativelanguage/data/aliasPropertiesAndSignals.qml | 2 +- .../qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml | 2 +- .../qdeclarativelanguage/data/aliasPropertyChangeSignals.qml | 2 +- .../declarative/qdeclarativelanguage/data/assignCompositeToType.qml | 2 +- .../declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml | 2 +- .../declarative/qdeclarativelanguage/data/assignObjectToVariant.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/attachedProperties.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.4.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.5.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.6.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.7.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.8.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/component.9.qml | 2 +- .../declarative/qdeclarativelanguage/data/componentCompositeType.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/crash2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml | 2 +- .../qdeclarativelanguage/data/customParserIdNotAllowed.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/customParserTypes.qml | 2 +- .../declarative/qdeclarativelanguage/data/declaredPropertyValues.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml | 2 +- .../qdeclarativelanguage/data/defaultPropertyListOrder.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml | 2 +- .../qdeclarativelanguage/data/dontDoubleCallClassBegin.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml | 2 +- .../qdeclarativelanguage/data/dynamicObjectProperties.2.qml | 4 ++-- .../declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml | 4 ++-- .../auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml | 2 +- .../declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml | 2 +- .../declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml | 2 +- .../declarative/qdeclarativelanguage/data/importIncorrectCase.qml | 2 +- .../declarative/qdeclarativelanguage/data/importNamespaceConflict.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml | 2 +- .../qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml | 2 +- .../declarative/qdeclarativelanguage/data/inlineQmlComponents.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.1.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.10.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.11.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.2.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.3.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.4.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.5.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.6.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.7.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.8.qml | 2 +- .../qdeclarativelanguage/data/invalidAttachedProperty.9.qml | 2 +- .../qdeclarativelanguage/data/invalidGroupedProperty.1.qml | 2 +- .../qdeclarativelanguage/data/invalidGroupedProperty.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml | 4 ++-- tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml | 2 +- .../data/lib/com/nokia/installedtest/InstalledTest.qml | 2 +- .../data/lib/com/nokia/installedtest/InstalledTest2.qml | 2 +- .../data/lib/com/nokia/installedtest/LocalLast.qml | 2 +- .../data/lib/com/nokia/installedtest/PrivateType.qml | 2 +- .../data/lib/com/nokia/installedtest0/InstalledTest.qml | 2 +- .../data/lib/com/nokia/installedtest0/InstalledTest2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml | 2 +- .../declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/method.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.4.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.5.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.6.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/property.7.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml | 2 +- .../qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml | 2 +- .../qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml | 2 +- .../auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml | 2 +- .../qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml | 2 +- tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml | 2 +- 130 files changed, 133 insertions(+), 133 deletions(-) (limited to 'tests/auto/declarative/qdeclarativelanguage/data') diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml index 6a33deffad..2cb7cbe2e0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml index 919f5d86a2..134e1440b5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant other diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml index 3f73538b24..54b548e049 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property alias obj : otherObj diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml index 428790d83d..e09eca2ff3 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 Alias3 {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml index 0bc2025414..9265ffb1df 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml index 9349a93877..889450b565 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml index cf32b45687..addc4265a9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml index 0687ce3995..f48a77598c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml index 5de8a4a76e..4667adda14 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int super_a: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml index 3a7022bdcd..c2ab70ffd6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant child diff --git a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml index 4526cf043e..42513e463f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property InlineAssignmentsOverrideBindingsType2 nested: InlineAssignmentsOverrideBindingsType2 { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml index 4127ca4375..4a45535a50 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int value diff --git a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml index f63283e773..59df88216e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Text {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml index 8aaddacec4..7d49b0ac98 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property QtObject o1 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml index 0ba4bd6d6f..06a3212916 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { x: "You can't assign a string to a real!" diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml index c2ac5c8458..947f14811f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyQmlObject { property int a: Math.max(10, 9) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml index c3d0e1ef47..11fb9d9578 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyQmlObject { property int a: Math.max(10, 9) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml index 44167af178..dbb3f06d32 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml index 7e5559a7b3..16a6d9d903 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant other diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml index 0c839ee7b1..cee2a88cf7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.0 QtObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml index 663e8d0efb..54d3c320e0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property QtObject o; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml index ec5536e7e8..0dc54d6787 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property QtObject object diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml index d480611c62..3cb280ef47 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant other diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml index 0a49ad51f2..01cf9142b2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant other diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml index f04b1f6052..60e66921d2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml index a15a718891..089130d14c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 AliasPropertyChangeSignalsType { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml index 7944deb44c..4e11b9174a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { id: root diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml index ed214ffe5a..717cd84536 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.0 QtObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml index ab6f3df8cf..de476ae47f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant test1: 1 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml index aab7ed2c20..1f731c539c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant a; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml index 3cde2e8269..54fef61ef0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 as Qt47 +import QtQuick 2.0 as Qt47 Qt47.QtObject { Qt47: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml index 1e932251df..3637ded26f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml @@ -1,6 +1,6 @@ import Test 1.0 import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyQmlObject.value: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml index f4f66ddab4..a22772bd89 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml index 7d677b5704..fbe315f771 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { id: myId diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml index 1b9af8bd85..bac23ef903 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { Component { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml index 806613c2a5..d07695477d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml index e94022a145..9867377bb9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { x: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml index 8f81a5a9ce..010949a35f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { id: QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml index 94bf189b5d..b1a31195eb 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.7.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { property int a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml index 69990cae5b..fb7a079d39 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.8.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { signal a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml index 5db98152d4..17824b4ede 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/component.9.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Component { function a() {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml index d04da62463..232b320fb0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant test diff --git a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml index 6ac71eea98..2b8d285348 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { objectName: "Hello" + "World" diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml index c1e47900b0..57241ffc28 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int on diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml index 50bc2aeb69..c42173ddfb 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 ListModel { ListElement { a: 10 } ListElement { id: foo; a: 12 } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml index 4cf68272ed..76a8a4773f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 ListModel { ListElement { a: 10 } ListElement { a: 12 } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml index f15373f1dd..03f5c1ff7e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int a: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml index d98dfdb5a5..66a78eb67f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyTypeObject { grouped { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml index 87dc3d3ea2..31d17fd55f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyContainer { QtObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml index ba65d78322..b5b29148a2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { onDestroyed: print("Hello World!") diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml index 0cdbdd73fe..905ee48e0b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { property QtObject object: DontDoubleCallClassBeginItem {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml index 2b6dd5d584..3dbd5b0b2e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { default property QtObject a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml index 7d11d990b5..5d4efeebb2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml index b0f2828eda..f084947eaf 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml index e28cad3a68..3691529aa9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { function a() {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml index 8e4acc05aa..64ba907415 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property UnknownType a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml index cdad72b5d2..2214bacda0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyCustomParserType { propa: a + 10 propb: Math.min(a, 10) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml index c03ec49278..6f822ba157 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml @@ -1,5 +1,5 @@ -import QtQuick 1.0 -import QtQuick 1.0 as Qt47 +import QtQuick 2.0 +import QtQuick 2.0 as Qt47 Qt.QtObject { property Qt47.QtObject objectProperty diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml index ed25c4b8a9..5d072b160a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml @@ -1,6 +1,6 @@ import Test 1.0 -import QtQuick 1.0 -import QtQuick 1.0 as Qt47 +import QtQuick 2.0 +import QtQuick 2.0 as Qt47 QtObject { property QtObject objectProperty diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml index 782adefad9..cd403b3d46 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { default property int intProperty : 10 property bool boolProperty: false diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml index 64848fe8b6..b86e89b5e7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 DynamicPropertiesNestedType { property int a: 13 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml index 78978dbace..d80d94be09 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal signal1 function slot1() {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml index 3eda6612c4..ff083250f0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Font { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml b/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml index 247f527fed..804e76b932 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import com.Nokia.installedtest 1.0 QtObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml index 39e384662b..45ad40501b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml @@ -1,4 +1,4 @@ import Test 1.0 as Rectangle -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml index 9589692e66..5cbee0264b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml @@ -1,5 +1,5 @@ // imports... import "will-not-be-found" -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml index d11000be78..15b6dc3a6e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 IncorrectCaseType { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml index cf32b45687..addc4265a9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml index 8f3c5cef79..4390d22d45 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 InlineAssignmentsOverrideBindingsType { property int test: nested.value diff --git a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml index a52bd23df5..a6f277adb2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyContainer { Component { id: myComponent diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml index 444e234825..f85e3e4e5b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyQmlObject { interfaceProperty: MyQmlObject {} } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml index 13bdb12196..8aab61e49e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property alias a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml index b6378c39ef..b85b2584eb 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property alias a: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml index c6dc44c4ef..20864b9a41 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyQmlObject.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml index 4942c21282..20906de606 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml @@ -1,5 +1,5 @@ import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Namespace.MadeUpClass.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml index e1fc8c15ef..95add15147 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml @@ -1,5 +1,5 @@ import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Namespace.madeUpClass.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml index 6938122171..050e619ff2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml @@ -1,5 +1,5 @@ import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Namespace.MyQmlObject.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml index 842600f014..24b09a53d5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyQmlObject: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml index 6f372a63b6..fb38ee9536 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml @@ -1,5 +1,5 @@ import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Namespace.MyQmlObject: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml index 07eb6f3432..789e42f7ef 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyQmlObject: QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml index b72567412d..9060a55d00 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Test.MyQmlObject: QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml index 50004edf84..47b6cc37d8 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyTypeObject.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml index 7cdf5cde33..146934f7ac 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml @@ -1,5 +1,5 @@ import Test 1.0 as Namespace -import QtQuick 1.0 +import QtQuick 2.0 QtObject { Namespace.MyTypeObject.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml index 503e9fa793..73724aa6e7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MadeUpClass.foo: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml index 94afb16cf2..fa46b8242a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant o; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml index d4fbf423b5..3e516738d6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int o; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml index 580a0f3975..37e7c5d4d0 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 -import QtQuick 1.0 as qt +import QtQuick 2.0 +import QtQuick 2.0 as qt QtObject {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml index bd26bc59a5..f9b322e35c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int parseInt diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml index 9985d3327b..56daa9c09a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 as Qt47 +import QtQuick 2.0 as Qt47 Qt47.Rectangle {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml index f63283e773..59df88216e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Text {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml index 7f491eb802..26a5d6bba9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml index 03bf25bc74..ed1b09e419 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Image {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml index 9985d3327b..56daa9c09a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 as Qt47 +import QtQuick 2.0 as Qt47 Qt47.Rectangle {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml index f63283e773..59df88216e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Text {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml index c02dd33b38..1af190633d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyContainer { containerChildren: QtObject {} } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml index 85abbdc511..74439c66d4 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { ListModel { diff --git a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml index 1f60951d30..dcfe37d6fc 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property list listProperty diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml index 4b37ed3518..fbb37705a1 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml @@ -1,5 +1,5 @@ // Check that a property in a later revision (prop2) cannot be assigned -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.0 MyRevisionedClass diff --git a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml index a3f97f8d34..a888b1aaf4 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/method.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { function MyMethod() {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml index e0e844234c..92aefef8c4 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { onClicked: console.log("Hello world!") } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml index bbd05a1ffb..cc1df4d181 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Item { NestedErrorsType {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml index 548b7b8637..28852f1a0c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Keys { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml index e75f9044e9..89e6777f8a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyTypeObject { // We set a and b to ensure that onCompleted is executed after bindings and diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml index 77fe2ff3c1..7d6da260b4 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyTypeObject { // We set a and b to ensure that onCompleted is executed after bindings and diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml index 0b46ceb685..6b43e6cc89 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property blah a; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml index 3ff16868bf..e6aa00e730 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property invalidmodifier a; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml index b219120af8..978c1aa80b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property invalidmodifier a; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml index bfadc9d496..bb94e84244 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { readonly property int a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml index 1bb4850777..a1401d2fdc 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { readonly property int a: value diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml index b5b3f423bb..88f493f9a9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.6.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int Hello diff --git a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml index f9ec68a40a..05eb319947 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/property.7.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int Hello: 10 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml index a7ef16af68..7d6fea24db 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int test: { var _ = 1; _ } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml index a165de8d16..fa690ba6bc 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int test: if (b == 1) 123; else 321; diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml index dea52c98a8..55c507f67e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml index 18c65c34d1..db8a3da2b2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { MyQmlObject.value: 10 } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml index c70a55c381..e3c56b701a 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant child diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml index 4d3d7d2a44..823439acdd 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.1 MyRevisionedClass diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml index 57d76b1c28..78ab51a4b7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.1 MyRevisionedSubclass diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml index f107356edf..d00758387e 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.1 MyRevisionedSubclass diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml index 7d1a9db2a7..1c27baa4e8 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal mySignal(nontype a) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml index e7780a0529..2b00ab80bb 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal mySignal(,) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml index 4289bce212..1bfcfff7b5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal mySignal(a) diff --git a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml index 6ce417db63..653c14e6aa 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { signal MySignal diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml index 2fd7fd2be0..e2760cb418 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property QtObject a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml index da56cb8243..ccbc6f0849 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property variant a diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml index 0b054d0243..f789a905f2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml index 0b054d0243..f789a905f2 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml @@ -1,2 +1,2 @@ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml index cc3f1c25b9..169b245450 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 QtObject { property int notifyCount: 0 diff --git a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml index 8c747157d4..3e8bca0368 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import Test 1.1 MySubclass diff --git a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml index 0699d67d91..973fdada24 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml @@ -1,5 +1,5 @@ import Test 1.0 -import QtQuick 1.0 +import QtQuick 2.0 MyQmlObject { qmlobjectProperty: QtObject {} } -- cgit v1.2.3