projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a6a8bee 6d331b6)
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, 6 Jan 2011 15:46:03 +0000 (01:46 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Jan 2011 15:46:03 +0000 (01:46 +1000)
commit679a545cb805382c97582dffa3fda4dbc438c81f
treef6ea9a9bd36b8636f0c5d5bf956c82a2ea81c391tree | snapshot
parenta6a8bee86f7e13d49d9115eb33aaee999bd15ad5commit | diff
parent6d331b6ee7711cde2bf9adc1a584a45875c07983commit | 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:
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB
6b46b7419a5aee9bd5fce67b7bfa8afe8e