From 6f3cdff090df6f4cf9044a667c3f331b779a84b5 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 5 Feb 2010 16:31:58 +1000 Subject: Fix test. --- .../declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp index ceee8f6..8ebdf19 100644 --- a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp +++ b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp @@ -124,8 +124,7 @@ void tst_qmlgraphicsborderimage::imageSource_data() << "Cannot open QUrl( \"file://" SRCDIR "/data/no-such-file.png\" ) "; QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true - << "Network error loading \"" SERVER_ADDR "/no-such-file.png\" " - "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; + << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" "; } void tst_qmlgraphicsborderimage::imageSource() -- cgit v0.12 From 6ecf052a6da0a67a7d499e022757a3cabd83a593 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 8 Feb 2010 10:07:30 +1000 Subject: Fix autotest. --- tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro | 4 ++++ tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro b/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro index 462723e..8e58a32 100644 --- a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro +++ b/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro @@ -1,5 +1,9 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui +contains(QT_CONFIG,xmlpatterns) { + QT += xmlpatterns + DEFINES += QTEST_XMLPATTERNS +} macx:CONFIG -= app_bundle SOURCES += tst_qmlxmllistmodel.cpp diff --git a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp index 8e97b7c..039cbf4 100644 --- a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp +++ b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ #include + +#ifdef QTEST_XMLPATTERNS #include #include #include @@ -195,3 +197,7 @@ void tst_qmlxmllistmodel::uniqueRoleNames() QTEST_MAIN(tst_qmlxmllistmodel) #include "tst_qmlxmllistmodel.moc" + +#else +QTEST_NOOP_MAIN +#endif -- cgit v0.12