diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-08 00:58:20 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-08 00:58:20 (GMT) |
| commit | ac84b4382c4ba5c81ad48c6774ce0dda74cfd83f (patch) | |
| tree | 3e8cd02c6d89b9f12a7d3d3d0cad3351d69de311 | |
| parent | 3b4c7da266d8118c57e75f93f2a624f470683b2b (diff) | |
| parent | 5917d43049020630cb6e79802547a150670304fd (diff) | |
| download | Qt-ac84b4382c4ba5c81ad48c6774ce0dda74cfd83f.zip Qt-ac84b4382c4ba5c81ad48c6774ce0dda74cfd83f.tar.gz Qt-ac84b4382c4ba5c81ad48c6774ce0dda74cfd83f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
3 files changed, 11 insertions, 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() 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 <qtest.h> + +#ifdef QTEST_XMLPATTERNS #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <private/qmlxmllistmodel_p.h> @@ -195,3 +197,7 @@ void tst_qmlxmllistmodel::uniqueRoleNames() QTEST_MAIN(tst_qmlxmllistmodel) #include "tst_qmlxmllistmodel.moc" + +#else +QTEST_NOOP_MAIN +#endif |