projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b43d48 177f2a2)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Jan 2011 13:00:21 +0000 (23:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 4 Jan 2011 13:00:21 +0000 (23:00 +1000)
commitf8696912869c702ddc5ac664659346554e96addf
tree9fb756251cfb1b0d80d90f7ff7ecc9879e28586ctree | snapshot
parent6b43d484c52c05a8404ef3e13084149b98bd794ecommit | diff
parent177f2a2f17251c22f57944e9dd100ec8515b891acommit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
  Support for swap modes in QGLWindowSurface.
  Pre-create the GL share widget before window surface creation.
  QMeeGoSwitchEvent exported and static.
  Fixed first element being a LineToElement in QPainterPath::connectPath()
6b46b7419a5aee9bd5fce67b7bfa8afe8e