diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 03:22:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 03:22:53 (GMT) |
| commit | 7bc616cce1c41825ebcdd6df35932eb128a9871c (patch) | |
| tree | e5bd793a33614a1886ee0ed53cae539c7bbf91f6 /doc | |
| parent | d499f265aa42231fd08df18213083aebe0db59ec (diff) | |
| parent | f3bd6565674f163b058bc235670d45631ce559ee (diff) | |
| download | Qt-7bc616cce1c41825ebcdd6df35932eb128a9871c.zip Qt-7bc616cce1c41825ebcdd6df35932eb128a9871c.tar.gz Qt-7bc616cce1c41825ebcdd6df35932eb128a9871c.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:
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 'doc')
| -rw-r--r-- | doc/src/images/qpainter-text.png | bin | 791 -> 1391 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qpainter-text.png b/doc/src/images/qpainter-text.png Binary files differindex af7821c..e95c965 100644 --- a/doc/src/images/qpainter-text.png +++ b/doc/src/images/qpainter-text.png |
