summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_poolgl.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:07:04 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:07:04 (GMT)
commit4da2ba2e788bb63a155e1d10ae559d4366eed875 (patch)
tree8ab88bdb3e59fa5ca6eab5ce8ab03445b138c591 /src/opengl/qpixmapdata_poolgl.cpp
parentaee4087d62900624822ea820b1eb8e2d960d0869 (diff)
parent48e91e6beb3cefbc15e583dcdb6005a7d9278104 (diff)
downloadQt-4da2ba2e788bb63a155e1d10ae559d4366eed875.zip
Qt-4da2ba2e788bb63a155e1d10ae559d4366eed875.tar.gz
Qt-4da2ba2e788bb63a155e1d10ae559d4366eed875.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Fix tab order in action editor dialog. Make QtUiTools use the lib-infix passed to configure.
Diffstat (limited to 'src/opengl/qpixmapdata_poolgl.cpp')
0 files changed, 0 insertions, 0 deletions