summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-29 10:12:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-29 10:12:46 (GMT)
commit26af4d54ea4f3a48d053038f34a00aa1119a585b (patch)
tree67054f761fe6f00e5295f02e4a6710dd97fa3d93 /src/gui/image/qpixmap.h
parent7f72741f06a6e9acdbcd99da6b438b3e7a1a753a (diff)
parent9c2ee0daafd159058d0804d4fc65a8ef1a4ed852 (diff)
downloadQt-26af4d54ea4f3a48d053038f34a00aa1119a585b.zip
Qt-26af4d54ea4f3a48d053038f34a00aa1119a585b.tar.gz
Qt-26af4d54ea4f3a48d053038f34a00aa1119a585b.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed `make test' for xmlpatternsxqts. Doc: Put the correct images with the D-Bus and Embedded Linux sections. Call cheaper clear() instead of assigning new QString() Fix some foreach usage to use const refs googlesuggest example: Add newline to end of file Core classes, examples, demos: Some changes from string to char Fix header labels on mac with rtl
Diffstat (limited to 'src/gui/image/qpixmap.h')
0 files changed, 0 insertions, 0 deletions