diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 05:33:00 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 05:33:00 (GMT) |
commit | d65cb666cba22f08dd72d8e3336b104713e9daca (patch) | |
tree | 827eca47ceb33fc600c420a08c47720d626c1cdf /src/gui/image | |
parent | 6174f91cc2a8a53c14d3b2f4eccc62f9170699c8 (diff) | |
parent | f800919c4336da77b73561cc5180fc167f61f435 (diff) | |
download | Qt-d65cb666cba22f08dd72d8e3336b104713e9daca.zip Qt-d65cb666cba22f08dd72d8e3336b104713e9daca.tar.gz Qt-d65cb666cba22f08dd72d8e3336b104713e9daca.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:
Fix compile warning
Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.
Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEvent
Set correct transformOrigin.
Fix IM repaint.
Set delegate Z before complete() so that view Z is overridden by delegate.
Fixed private header include style to work when headers are installed.
Diffstat (limited to 'src/gui/image')
0 files changed, 0 insertions, 0 deletions