From fac021ba418c1082dd8cab4974b8425a32fd0f6a Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 5 Feb 2010 11:16:40 +1000 Subject: Add a QEXPECT_FAIL for known bug. --- tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp index af4bcda..8e97b7c 100644 --- a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp +++ b/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp @@ -171,6 +171,8 @@ void tst_qmlxmllistmodel::roleErrors() QCOMPARE(data.value(Qt::UserRole), QVariant()); QCOMPARE(data.value(Qt::UserRole+1), QVariant()); QCOMPARE(data.value(Qt::UserRole+2), QVariant()); + + QEXPECT_FAIL("", "QT-2456", Continue); QCOMPARE(data.value(Qt::UserRole+3), QVariant()); delete listModel; -- cgit v0.12 From 591354d2fafa055a72b4fe8f45e86b39909fad40 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 5 Feb 2010 11:44:55 +1000 Subject: Test fixes. --- tests/auto/declarative/declarative.pro | 2 +- tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro | 1 + tests/auto/declarative/sql/sql.pro | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 0c4dc80..bb95826 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -6,7 +6,7 @@ SUBDIRS += \ behaviors \ # Cover datetimeformatter \ # Cover examples \ - graphicswidgets \ # Cover + graphicswidgets \ # Cover layouts \ # Cover numberformatter \ # Cover parserstress \ # Cover diff --git a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro b/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro index c81912b..a590616 100644 --- a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro +++ b/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro @@ -1,5 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative +contains(QT_CONFIG,webkit): QT += webkit macx:CONFIG -= app_bundle SOURCES += tst_qmlgraphicswebview.cpp testtypes.cpp diff --git a/tests/auto/declarative/sql/sql.pro b/tests/auto/declarative/sql/sql.pro index 875e9d8..4217eac 100644 --- a/tests/auto/declarative/sql/sql.pro +++ b/tests/auto/declarative/sql/sql.pro @@ -1,6 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative -QT += script +QT += sql script macx:CONFIG -= app_bundle SOURCES += tst_sql.cpp -- cgit v0.12