From 494d2d9041b7277f6d22146593ff01c7c7f7021b Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Mon, 24 Aug 2009 17:03:09 +1000 Subject: Fix test on case insensitive filesystems. We cannot have a failingComponent.qml and a FailingComponent.qml file --- tests/auto/declarative/qmlparser/FailingComponent.qml | 5 ----- tests/auto/declarative/qmlparser/failingComponent.qml | 8 ++++---- tests/auto/declarative/qmlparser/failingComponentTest.qml | 4 ++++ tests/auto/declarative/qmlparser/tst_qmlparser.cpp | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 tests/auto/declarative/qmlparser/FailingComponent.qml create mode 100644 tests/auto/declarative/qmlparser/failingComponentTest.qml diff --git a/tests/auto/declarative/qmlparser/FailingComponent.qml b/tests/auto/declarative/qmlparser/FailingComponent.qml deleted file mode 100644 index 1c01e3d..0000000 --- a/tests/auto/declarative/qmlparser/FailingComponent.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt 4.6 - -Object { - a: 10 -} diff --git a/tests/auto/declarative/qmlparser/failingComponent.qml b/tests/auto/declarative/qmlparser/failingComponent.qml index bc21243..1c01e3d 100644 --- a/tests/auto/declarative/qmlparser/failingComponent.qml +++ b/tests/auto/declarative/qmlparser/failingComponent.qml @@ -1,5 +1,5 @@ -import Test 1.0 -MyContainer { - FailingComponent {} -} +import Qt 4.6 +Object { + a: 10 +} diff --git a/tests/auto/declarative/qmlparser/failingComponentTest.qml b/tests/auto/declarative/qmlparser/failingComponentTest.qml new file mode 100644 index 0000000..74a6acf --- /dev/null +++ b/tests/auto/declarative/qmlparser/failingComponentTest.qml @@ -0,0 +1,4 @@ +import Test 1.0 +MyContainer { + FailingComponent {} +} diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp index 0bac946..a9c4351 100644 --- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp +++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp @@ -143,7 +143,7 @@ void tst_qmlparser::errors_data() QTest::newRow("unregisteredObject") << "unregisteredObject.qml" << "unregisteredObject.errors.txt" << false; QTest::newRow("empty") << "empty.qml" << "empty.errors.txt" << false; QTest::newRow("missingObject") << "missingObject.qml" << "missingObject.errors.txt" << false; - QTest::newRow("failingComponent") << "failingComponent.qml" << "failingComponent.errors.txt" << false; + QTest::newRow("failingComponent") << "failingComponentTest.qml" << "failingComponent.errors.txt" << false; QTest::newRow("missingSignal") << "missingSignal.qml" << "missingSignal.errors.txt" << false; QTest::newRow("finalOverride") << "finalOverride.qml" << "finalOverride.errors.txt" << false; } -- cgit v0.12