Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 27 Sep 2011 00:20:24 +0000 (10:20 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 27 Sep 2011 00:20:24 +0000 (10:20 +1000)
commitd7489680a80df5d77fbc032b1bc656a8dab1a986
tree57e8d94833275c2df28ad71dfa70f843498c243a
parent2f86072e5daf318a2aa9d400f045eae9563b2ae6
parentad7ddea09126efeb58ab626dc13113e3e1956912
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
dist/changes-4.8.0