diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-05 02:41:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-05 02:41:03 (GMT) |
| commit | 2d7b0bbe0997250445c99edd93f4fe5529781b93 (patch) | |
| tree | b711a53295eedc6a21b2870e4afb6c49a7c76c0f /tests/auto/declarative | |
| parent | d97105a6c470ca3982fbc24dc469287fc2d89a84 (diff) | |
| parent | 591354d2fafa055a72b4fe8f45e86b39909fad40 (diff) | |
| download | Qt-2d7b0bbe0997250445c99edd93f4fe5529781b93.zip Qt-2d7b0bbe0997250445c99edd93f4fe5529781b93.tar.gz Qt-2d7b0bbe0997250445c99edd93f4fe5529781b93.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/declarative')
4 files changed, 5 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/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; 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 |