summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_x11gl_egl.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-17 12:14:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-17 12:14:32 (GMT)
commitf30cf8d452afd8e279384fe6a6a10216c7d52304 (patch)
tree3695dc75a57ee15aad55f91ad7a348488fddf0a5 /src/opengl/qpixmapdata_x11gl_egl.cpp
parent996a719324a678a0a5d130eef6380451a207ffe7 (diff)
parentfb934f2a8d7398a3ff39a107093f9da6ceda59a7 (diff)
downloadQt-f30cf8d452afd8e279384fe6a6a10216c7d52304.zip
Qt-f30cf8d452afd8e279384fe6a6a10216c7d52304.tar.gz
Qt-f30cf8d452afd8e279384fe6a6a10216c7d52304.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix a crash in a11y introduced by d289e54f2d2aa066cb3 Fix bug QTBUG-13901, Mac style button rect Cocoa: change usage of deprecated API (scrolling) in Lion
Diffstat (limited to 'src/opengl/qpixmapdata_x11gl_egl.cpp')
0 files changed, 0 insertions, 0 deletions