Merge remote-tracking branch 'qt-mainline/4.8'
authoraavit <qt-info@nokia.com>
Thu, 8 Sep 2011 19:42:31 +0000 (21:42 +0200)
committeraavit <qt-info@nokia.com>
Thu, 8 Sep 2011 19:42:31 +0000 (21:42 +0200)
commita2c2c71ecd84e90f72697dfd57544c8d506c78e2
treec5e31ff16e2471d33a124a6a37f4e48acdacd235
parent6326227674efa85c1a5320141041110d211efc75
parent260005374b9b930aa583cd117aba96f8f4b34131
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
tools/qvfb/qvfbshmem.cpp
tools/qvfb/qvfb.pro