diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-28 18:49:27 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-28 18:49:27 +1000 |
commit | e059416ca027831405a1a291b325a345d8248ffc (patch) | |
tree | 5f0477deb13614099672b02fc5225b4171ecd9a0 /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
parent | 3c67a14ad0db0e83e70b2432394f168ce279518b (diff) | |
parent | ac5dd6599abddf4e0191be11b4768529d641e1aa (diff) | |
download | qt4-tools-e059416ca027831405a1a291b325a345d8248ffc.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Reorder variable to eliminate warnings
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