diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 05:40:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 05:40:43 (GMT) |
| commit | d1a21551dc31937db4b62b2406ea3820dd8a8c0a (patch) | |
| tree | 38949bd50cc2df96a56b702815b1838c9c2cae43 /tests/auto | |
| parent | 19fd8c6c4c7e1a739cae53fa51c6994643ef5be1 (diff) | |
| parent | fd1e840eba4567e67b55a00f7f761fc9815eaa47 (diff) | |
| download | Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.zip Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.tar.gz Qt-d1a21551dc31937db4b62b2406ea3820dd8a8c0a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix failing autotest
XmlListModel should allow types other than application/xml
Document using Behaviors with States.
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index af54008..a0e2547 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -418,7 +418,7 @@ void tst_qdeclarativexmllistmodel::headers() QTRY_COMPARE(model->status(), QDeclarativeXmlListModel::Ready); QVariantMap expectedHeaders; - expectedHeaders["Accept"] = "application/xml"; + expectedHeaders["Accept"] = "application/xml,*/*"; QCOMPARE(factory.lastSentHeaders.count(), expectedHeaders.count()); foreach (const QString &header, expectedHeaders.keys()) { |