diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-07 03:53:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-07 03:53:07 (GMT) |
| commit | 1bf5e9b3c328a80e71e7deed3419ff9d442db3cb (patch) | |
| tree | 7f5eba92e388fc22ddbe6bfb2ecb7cc00af96425 /src/gui/image/qicon.cpp | |
| parent | e56ae7fb7b269afe36a3bd2f4de0c10f8c2a6924 (diff) | |
| parent | 670b1cfccd68a69e03544adff5dea1a21dc2b339 (diff) | |
| download | Qt-1bf5e9b3c328a80e71e7deed3419ff9d442db3cb.zip Qt-1bf5e9b3c328a80e71e7deed3419ff9d442db3cb.tar.gz Qt-1bf5e9b3c328a80e71e7deed3419ff9d442db3cb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits)
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
Allow empty authority in QUrl::setAuthority as per docs.
Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
fixed case of GL include directory
check in MAC_APPLICATION_MENU translations
Re-generate the Unicode tables after updates to the program that generates them
Fix the code after merge: DerivedNormalizationProps has two or more columns
add some usefull definitions to qunicodetables_p.h
qchar.cpp: fix identation
finish last commit
prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
improve error reporting a bit more
improve error reporting
fix incorect condition
check if string to int conversions were done w/o errors
improve error reporting for unassigned grapheme/word/sentence break classes
avoid using of qunicodetables_p.h in generator
use QHash for line break map
...
Diffstat (limited to 'src/gui/image/qicon.cpp')
0 files changed, 0 insertions, 0 deletions