diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
| commit | 0832d7209e3aee7055fb39339030ff6842f4117d (patch) | |
| tree | 75ec174a5492d0ddc52bc2f4dcdef363714a63cb /doc/src/snippets/code | |
| parent | ad0d0c4b6f7958b3cde01855b0f3b9c68db5253a (diff) | |
| parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
| download | Qt-0832d7209e3aee7055fb39339030ff6842f4117d.zip Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.gz Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_symbian-introduction.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc b/doc/src/snippets/code/doc_src_symbian-introduction.qdoc index 60c69c0..a2ea686 100644 --- a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc +++ b/doc/src/snippets/code/doc_src_symbian-introduction.qdoc @@ -63,6 +63,5 @@ //! [4] //! [5] - set QT_SIS_OPTIONS=-i - make sis + make deploy //! [5] |