projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 150df20 b7b9a22)
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>
Thu, 12 May 2011 18:39:02 +0000 (04:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 18:39:02 +0000 (04:39 +1000)
commitf6d9a717946422d910ec9e680197617eb706410c
treeaa352c7e64efc5e22e27e1e336d3baeed3ce916dtree | snapshot
parent150df2037f392225771f94b39f7a340d7c154de7commit | diff
parentb7b9a22ce263fcb430ff4228fb88ca5229a6e226commit | 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:
  Clear confusion between QMainWindow and QMainWindowLayout.
6b46b7419a5aee9bd5fce67b7bfa8afe8e