summaryrefslogtreecommitdiff
path: root/doc/src/snippets/code/doc_src_examples_imageviewer.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-30 01:33:44 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-30 01:33:44 +1000
commit564d2a31a1fd7dfff9a4f6cc2ae814d9307e88a9 (patch)
tree6e35b7c0091c5cc7514b8740cfaf90234a48bbca /doc/src/snippets/code/doc_src_examples_imageviewer.cpp
parent6469ed030a0edbb08b7856c9292fcceb155dff86 (diff)
parentf8560717dd56514269cfb081c7f4b94e231e10d7 (diff)
downloadqt4-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/doc_src_examples_imageviewer.cpp')
0 files changed, 0 insertions, 0 deletions