summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-23 08:08:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-23 08:08:28 (GMT)
commitaf5cda49d5b6fa22e1cb1567ac874787e31a87c2 (patch)
treeb4f0b826b7a88845938ad074d105efe0d575a424 /tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
parente6694ebe4081b807b1bb0946e17e73840019ec6d (diff)
parenteb395badcba6eada75ad5e6a72b74f5204170ed9 (diff)
downloadQt-af5cda49d5b6fa22e1cb1567ac874787e31a87c2.zip
Qt-af5cda49d5b6fa22e1cb1567ac874787e31a87c2.tar.gz
Qt-af5cda49d5b6fa22e1cb1567ac874787e31a87c2.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: WorkerScript could starve image loading of CPU. More docs for FolderListModel Improve docs on attached properties on view delegates. Models which load incrementally via fetchMore() don't work. Try fixing build error on Windows Ensure PathView doesn't jump when starting to drag. Nested flickables would react alternately to flicks. Improve QDeclarativeComponent test coverage. Add additional QDeclarativeProperty autotests. Removing all visible items in ListView resulted in blank view. XmlListModel requests should set 'Accept' header to 'application/xml'
Diffstat (limited to 'tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro')
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
index 472cffb..efcea12 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative script gui
+contains(QT_CONFIG,declarative): QT += declarative script gui network
contains(QT_CONFIG,xmlpatterns) {
QT += xmlpatterns
DEFINES += QTEST_XMLPATTERNS