summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-29 13:26:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-29 13:26:50 (GMT)
commita716c176c5a89c5dd0e3f0a9b6738d8a217ee6b9 (patch)
tree69ff7b89b32764ff62575b2e81ecd4c25470d691 /src/corelib
parentc0f5eeec92f188381d7f085b2d4f5ea08ecc665c (diff)
parentf5592ef682ce18e7e6fd3770de722a5255a34ef7 (diff)
downloadQt-a716c176c5a89c5dd0e3f0a9b6738d8a217ee6b9.zip
Qt-a716c176c5a89c5dd0e3f0a9b6738d8a217ee6b9.tar.gz
Qt-a716c176c5a89c5dd0e3f0a9b6738d8a217ee6b9.tar.bz2
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: QMeeGoLivePixmapData: Verify dimensions of locked pixmap
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions