summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmapdata_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-05 10:11:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-05 10:11:39 (GMT)
commitb5a5c7ce06291d4f9cae15383bd35677db277138 (patch)
treeb4c607a6c68aa1a6c99b1e884c2f67bc34e5b1b7 /src/gui/image/qpixmapdata_p.h
parent30bc5cb0d559bbab87e2d8c4ecf2a25d8e748649 (diff)
parentf92253080a73a60a3d6ce8343b94788334ce9a2b (diff)
downloadQt-b5a5c7ce06291d4f9cae15383bd35677db277138.zip
Qt-b5a5c7ce06291d4f9cae15383bd35677db277138.tar.gz
Qt-b5a5c7ce06291d4f9cae15383bd35677db277138.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: Compile. Another fix for the non unified title+toolbar regarding text under icons My 4.6.2 changes Added my changes to changes file. Doc: Correcting image My changes for 4.6.2 My changelog for 4.6.2 My Changelog entries for 4.6.2 Add the QMAKE_FILE_EXT variable to extra compilers generation. Doc: Removed promisse to fix a problem Add some entries to the change log Change log updated Improve raster graphics system performance on Mac (second try). I10n/German: Update translations for 4.6.2 I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
0 files changed, 0 insertions, 0 deletions