summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-10 15:56:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-10 15:56:50 (GMT)
commitdfb33cf9739a6dd0a6c90961c65f71692f093a38 (patch)
treee3ab31f1f2bfb7ba780adb2a6a2d23aaa88a7454 /dist
parentf74029e286e97067ac39086955481bf979af69dc (diff)
parent1c1d31d702ee22b2cf501a4472b7068ad160df68 (diff)
downloadQt-dfb33cf9739a6dd0a6c90961c65f71692f093a38.zip
Qt-dfb33cf9739a6dd0a6c90961c65f71692f093a38.tar.gz
Qt-dfb33cf9739a6dd0a6c90961c65f71692f093a38.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions