From 93353ce0cf416c53238eb908a8e4ccb3e68df73d Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 24 Feb 2010 17:37:48 +1000 Subject: Fixup tests after QDeclarative class renames --- src/declarative/qml/qdeclarativescriptparser.cpp | 2 +- .../auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml | 8 -------- tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml | 8 ++++++++ .../data/qdeclarativeAttachedPropertiesObjectMethod.1.qml | 5 ----- .../data/qdeclarativeAttachedPropertiesObjectMethod.2.qml | 6 ------ .../data/qmlAttachedPropertiesObjectMethod.1.qml | 5 +++++ .../data/qmlAttachedPropertiesObjectMethod.2.qml | 6 ++++++ .../declarative/qdeclarativelanguage/data/script.12.errors.txt | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml create mode 100644 tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml delete mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml delete mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index 9636350..f4c9cdd 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -771,7 +771,7 @@ bool ProcessAST::visit(AST::UiSourceElement *node) } else { QDeclarativeError error; - error.setDescription(QCoreApplication::translate("QDeclarativeParser","QDeclarativeJS declaration outside Script element")); + error.setDescription(QCoreApplication::translate("QDeclarativeParser","JavaScript declaration outside Script element")); error.setLine(node->firstSourceLocation().startLine); error.setColumn(node->firstSourceLocation().startColumn); _parser->_errors << error; diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml deleted file mode 100644 index ce05f89..0000000 --- a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt 4.6 - -QtObject { - property var nested - - nested: QtObject { - } -} diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml new file mode 100644 index 0000000..ce05f89 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +QtObject { + property var nested + + nested: QtObject { + } +} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml deleted file mode 100644 index 429c327..0000000 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Test 1.0 -import Qt 4.6 -QtObject { -} - diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml deleted file mode 100644 index 0f57b61..0000000 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml +++ /dev/null @@ -1,6 +0,0 @@ -import Test 1.0 -import Qt 4.6 -QtObject { - MyQmlObject.value: 10 -} - diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml new file mode 100644 index 0000000..429c327 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml @@ -0,0 +1,5 @@ +import Test 1.0 +import Qt 4.6 +QtObject { +} + diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml new file mode 100644 index 0000000..0f57b61 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml @@ -0,0 +1,6 @@ +import Test 1.0 +import Qt 4.6 +QtObject { + MyQmlObject.value: 10 +} + diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt index 85c8396..f8297f5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt @@ -1 +1 @@ -4:5:QmlJS declaration outside Script element +4:5:JavaScript declaration outside Script element -- cgit v0.12