diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 12:30:20 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 12:30:20 (GMT) |
commit | d52e4462652c925a293a22c2880392e0458735bc (patch) | |
tree | 0832a08361dd610a6aa6299b289b3251919b4799 /src/corelib/tools/qset.qdoc | |
parent | 0d446ec758aacd131f2da0fa67a081fd93cff898 (diff) | |
parent | ffd6720bacb5f1a9146384debf0cb82377650c43 (diff) | |
download | Qt-d52e4462652c925a293a22c2880392e0458735bc.zip Qt-d52e4462652c925a293a22c2880392e0458735bc.tar.gz Qt-d52e4462652c925a293a22c2880392e0458735bc.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix C++0x initializer lists tests.
Keep other text format with QTextOption::SuppressColors tag on
Diffstat (limited to 'src/corelib/tools/qset.qdoc')
0 files changed, 0 insertions, 0 deletions