projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67b3edc a4ce1a3)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 24 Nov 2011 09:19:07 +0000 (19:19 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 24 Nov 2011 09:19:07 +0000 (19:19 +1000)
commit0e7c7f75b404c26b420cb174f062eda02846641f
tree111d1e8480d96de6554e58c7c2a3a0695ddbcc73tree | snapshot
parent67b3edc50ad6e574f777d9accebe0750fbe3ddf7commit | diff
parenta4ce1a327ae3658394a2acd8a3769f3bbba50863commit | diff
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix Linux-Symbian parallel cross-compilation configure step
  Symbian: don't merge native clipboard, overwrite.
  Surviving out of memory in Qt Quick app
  Export QtGui functions required by QtMultimediaKit backend
  fix bearer crash
  Fix alignment of non-wrapped richtext QML Text elements.
6b46b7419a5aee9bd5fce67b7bfa8afe8e