diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 01:33:44 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 01:33:44 +1000 |
commit | 564d2a31a1fd7dfff9a4f6cc2ae814d9307e88a9 (patch) | |
tree | 6e35b7c0091c5cc7514b8740cfaf90234a48bbca /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
parent | 6469ed030a0edbb08b7856c9292fcceb155dff86 (diff) | |
parent | f8560717dd56514269cfb081c7f4b94e231e10d7 (diff) | |
download | qt4-tools-564d2a31a1fd7dfff9a4f6cc2ae814d9307e88a9.tar.gz |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix text color in some cases of QML and QStaticText
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions