summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativevisualdatamodel
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-281-0/+5
|\
| * Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-18839 Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6 Merge-request: 2598 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-234-1/+167
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-0/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| | * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+24
| | | | | | | | | | | | | | | | | | | | | There are no visual items if there is no delegate. Task-number: QTBUG-14781 Reviewed-by: Robert Griebl
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-253-0/+142
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * Additional autotests for VisualDataModel.Michael Brasser2010-10-153-0/+142
| | |
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
|/ | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-295-5/+5
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-163-0/+104
| | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
* Fix VisualDataModel model update handling when rootIndex is specified.Martin Jones2010-08-272-6/+71
| | | | Task-number: QTBUG-13038
* Add test for VisualItemModel layoutChanged() handlingMartin Jones2010-08-252-0/+50
| | | | Task-number: QTBUG-13146
* Fix ListView sections with QList<QObject*>Martin Jones2010-07-192-0/+6
| | | | | | | QDeclarativeVisualDataModel::stringValue() did not handle QList<QObject*> model types. Task-number: QTBUG-12005
* Update tests following QDeclarativeFlickable::viewport() -> contentIem()Martin Jones2010-06-241-3/+3
|
* Make declarative autotests compile on Symbian abld build systemJoona Petrell2010-06-082-2/+6
| | | | | Task-number: Reviewed-by: Martin Jones
* Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-181-1/+1
| | | | Also rearrange the parameter order to be more clear.
* Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-141-2/+8
| | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones
* Add missing test file.Martin Jones2010-05-061-0/+16
|
* Test for QList<QObject*> model with object properties changing.Martin Jones2010-05-051-0/+99
|
* Add hasModelChildren property to delegates with QAbstractItemModel model type.Martin Jones2010-04-213-0/+133
Also add some helper function to VisualDataModel: - VisualDataModel::modelIndex(int) returns a QModelIndex which can be assigned to VisualDataModel::rootIndex - VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex