summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-08 23:15:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-08 23:15:37 (GMT)
commit0d3531e2405b77b9f3acff437b44a7b96d64f586 (patch)
tree71fc6f5672b99c39a923c4223f3b2db608621f6d /src/gui/image/qpixmap.h
parent526705430be6371166464689e970752a5ce41ed6 (diff)
parente1a97ef26c67a844be7c05af94270b25f013a673 (diff)
downloadQt-0d3531e2405b77b9f3acff437b44a7b96d64f586.zip
Qt-0d3531e2405b77b9f3acff437b44a7b96d64f586.tar.gz
Qt-0d3531e2405b77b9f3acff437b44a7b96d64f586.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't cause repaints during painting in Text element
Diffstat (limited to 'src/gui/image/qpixmap.h')
0 files changed, 0 insertions, 0 deletions