diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 22:01:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-17 22:01:49 (GMT) |
| commit | 9c1dc504c8f12858ab9c0b610bebb19019005eaa (patch) | |
| tree | 0ab216f8005fb13131eebf29876ed4e286c8122c /src/gui/text/qtextobject.cpp | |
| parent | b53107577d64f4a3694a2184a3ccc87ed3aed3f2 (diff) | |
| parent | 837b6bba916c39665884e4967d70808f863c4487 (diff) | |
| download | Qt-9c1dc504c8f12858ab9c0b610bebb19019005eaa.zip Qt-9c1dc504c8f12858ab9c0b610bebb19019005eaa.tar.gz Qt-9c1dc504c8f12858ab9c0b610bebb19019005eaa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the blending of ARGB_PM image when using palignr to load the data
Adjusted define styling
Fixes QWS window decoration offset issues
tst_QDataStream::stream_QPixmap: actualy test QPixmap.
Keyboard navigation regression in QTreeView
Implement the general blending of ARGB32_pm with SSSE3
QtDeclarative debugging: Add an option not to stream the properties of an object.
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
0 files changed, 0 insertions, 0 deletions