summaryrefslogtreecommitdiffstats
path: root/src/imports/folderlistmodel/plugin.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 15:31:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 15:31:59 (GMT)
commit93315950003e14df6a43bea50829d17adef7fe30 (patch)
treed1be2da2c96d03ce920b0b6097bbe9e483584cac /src/imports/folderlistmodel/plugin.cpp
parentbe04377b22475772e376a51017855a00cc732e80 (diff)
parent25e2e372e43374c4f161c06e48f62e738b968370 (diff)
downloadQt-93315950003e14df6a43bea50829d17adef7fe30.zip
Qt-93315950003e14df6a43bea50829d17adef7fe30.tar.gz
Qt-93315950003e14df6a43bea50829d17adef7fe30.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 FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
Diffstat (limited to 'src/imports/folderlistmodel/plugin.cpp')
0 files changed, 0 insertions, 0 deletions