diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:20:27 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:20:27 +1000 |
commit | f9aa35c62fac62f5711eada4ad0dcccc2672b0a8 (patch) | |
tree | 440c058356ae0df954137ca9009fd67d88ea9039 /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
parent | 1fec80d000885cfe77bc68915e5c11dd4ee77d3d (diff) | |
parent | 15e6ac8f4d9e7a419cd0c10405954bde78559fac (diff) | |
download | qt4-tools-f9aa35c62fac62f5711eada4ad0dcccc2672b0a8.tar.gz |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Only compare styleNames if they are not empty
Add styleName to QFontDef comparison
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions