diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 09:43:13 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 09:43:13 (GMT) |
commit | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (patch) | |
tree | 1166be97fcfcc6a71b9603443ef6360d33aef276 /doc/src/snippets/picture | |
parent | 80e13f5bd418395bd64396e359a288b748ae1dfb (diff) | |
parent | 7b10151cb6550fe8060217fad8549950eadd5fca (diff) | |
download | Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.zip Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.tar.gz Qt-84294f47e55073914bcbcdbaf85df1a0e2e2d845.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'doc/src/snippets/picture')
-rw-r--r-- | doc/src/snippets/picture/picture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp index 0c5712a..5283978 100644 --- a/doc/src/snippets/picture/picture.cpp +++ b/doc/src/snippets/picture/picture.cpp @@ -76,7 +76,7 @@ int main() // FORMATS //! [2] QStringList list = QPicture::inputFormatList(); - foreach (QString string, list) + foreach (const QString &string, list) myProcessing(string); //! [2] } @@ -85,7 +85,7 @@ int main() // OUTPUT //! [3] QStringList list = QPicture::outputFormatList(); - foreach (QString string, list) + foreach (const QString &string, list) myProcessing(string); //! [3] } |