diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-05 02:05:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-05 02:05:39 (GMT) |
commit | 91814c0a9d32b5a306037a73c067c02d3f5be4ff (patch) | |
tree | 38f608f400527e1c8c14cc652faa1c3fc61392e8 /tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp | |
parent | 46db88be9fb0b8951916d706c39e1079f38f277d (diff) | |
parent | 2cfbc2b874ebec52ee76adc60b51dca138827d8c (diff) | |
download | Qt-91814c0a9d32b5a306037a73c067c02d3f5be4ff.zip Qt-91814c0a9d32b5a306037a73c067c02d3f5be4ff.tar.gz Qt-91814c0a9d32b5a306037a73c067c02d3f5be4ff.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
qmlplugindump: Fix missing flush for objects that don't fit a line.
qmlplugindump: Avoid reporting types as attaching to themselves.
Diffstat (limited to 'tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp')
0 files changed, 0 insertions, 0 deletions