projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8d87a34 b4c12d1)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 10:04:27 +0000 (20:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 10:04:27 +0000 (20:04 +1000)
commit6fcbbb233cacfcf658f7f9cae5bb7486c713bc04
treea67d42a80db0a48d3228613b6d58c6d69965b870tree | snapshot
parent8d87a34453fe0f18ebee5a9a0a4edd6f58b896efcommit | diff
parentb4c12d184aa673003bdcd1a9ccd0a863774bc1c9commit | 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 missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
  Fix m_longTapDetector causing crash.
  Fix to incorrect ApplicationActivate event in QtOpenGL
  Symbian - Fix QFile::map with non page aligned offsets
6b46b7419a5aee9bd5fce67b7bfa8afe8e