diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-24 07:37:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-24 07:37:48 (GMT) |
| commit | 93353ce0cf416c53238eb908a8e4ccb3e68df73d (patch) | |
| tree | fb1418586da210f76d23504870a2a7b00c366a4b | |
| parent | 7eb5fc91a30a360507a65c19b6a3b96f757c2c4e (diff) | |
| download | Qt-93353ce0cf416c53238eb908a8e4ccb3e68df73d.zip Qt-93353ce0cf416c53238eb908a8e4ccb3e68df73d.tar.gz Qt-93353ce0cf416c53238eb908a8e4ccb3e68df73d.tar.bz2 | |
Fixup tests after QDeclarative class renames
| -rw-r--r-- | src/declarative/qml/qdeclarativescriptparser.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml (renamed from tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt | 2 |
5 files changed, 2 insertions, 2 deletions
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/qmlObject.qml index ce05f89..ce05f89 100644 --- a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml +++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml index 429c327..429c327 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml index 0f57b61..0f57b61 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml 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 |