Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 05:33:00 +0000 (06:33 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 05:33:00 +0000 (06:33 +0100)
commitd65cb666cba22f08dd72d8e3336b104713e9daca
tree827eca47ceb33fc600c420a08c47720d626c1cdf
parent6174f91cc2a8a53c14d3b2f4eccc62f9170699c8
parentf800919c4336da77b73561cc5180fc167f61f435
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.