diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 15:07:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 15:07:04 (GMT) |
commit | 78b3b444d0d1f3d0afa9c4317f4e183ab2368b5c (patch) | |
tree | 24e507fa5422647fdd0c3e504de24f369ebfe880 /src/gui/graphicsview/qgraphicsitem.cpp | |
parent | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (diff) | |
parent | af0185c11da338c9907ee7ac33266fb474680358 (diff) | |
download | Qt-78b3b444d0d1f3d0afa9c4317f4e183ab2368b5c.zip Qt-78b3b444d0d1f3d0afa9c4317f4e183ab2368b5c.tar.gz Qt-78b3b444d0d1f3d0afa9c4317f4e183ab2368b5c.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 qml plugin loading with specified path in qmldir
Fix installation of qmldir files
Optimization: Use internal QGraphicsItemPrivate::setItemParentHelper()
Move basic focusscope examples into auto tests.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
0 files changed, 0 insertions, 0 deletions