diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
| commit | 10ee284f7722c2479e85d469b179c9311b10238a (patch) | |
| tree | f763d60087111ed6210812b3d028a07513807996 /tests/auto/declarative | |
| parent | 1ec06a42b2b18b850b5ede133d1c23a00e6dbe21 (diff) | |
| parent | f95e0d4dee769363a9c84b27f854055b0425e6ec (diff) | |
| download | Qt-10ee284f7722c2479e85d469b179c9311b10238a.zip Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.gz Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qml.h
Diffstat (limited to 'tests/auto/declarative')
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt index 5e88900..e3c2df7 100644 --- a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt @@ -1 +1 @@ -4:5:Invalid component specification +4:5:Component elements may not contain properties other than id diff --git a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt index 8299d23..13f47d1 100644 --- a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt @@ -1 +1 @@ -6:9:Invalid component specification +6:9:Component elements may not contain script blocks diff --git a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt index dc1eb53..41e8d46 100644 --- a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt @@ -1 +1 @@ -5:9:Invalid component specification +5:9:Component elements may not contain script blocks diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 5f9cb1b..ecdd33a 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -335,7 +335,7 @@ void tst_qmllanguage::errors() QFETCH(bool, create); if (file == "invalidID.6.qml") - QSKIP("Test disabled until we strictly disallow ids from beginning with uppercase letters", SkipSingle); + QTest::ignoreMessage(QtWarningMsg, "id \"StartsWithUpperCase\" is invalid: ids cannot start with uppercase letters"); QmlComponent component(&engine, TEST_FILE(file)); |