diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 03:23:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-19 03:23:19 (GMT) |
| commit | df6549d1b95af017305744af04a7bb3b10025660 (patch) | |
| tree | 0919c82a21e0b0056f0eb180ce139c8ab99eb633 /doc/src/snippets/code | |
| parent | 84f984b24400aed7cc72fdf432a076f98bc142a2 (diff) | |
| parent | 63d0b54df365380107cea7017c7893c7d04df13e (diff) | |
| download | Qt-df6549d1b95af017305744af04a7bb3b10025660.zip Qt-df6549d1b95af017305744af04a7bb3b10025660.tar.gz Qt-df6549d1b95af017305744af04a7bb3b10025660.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (351 commits)
Fix compilation after merge
fix for looping crash log on data abort
Allow commenting of individual files in generated pkg files.
Removed README.s60-mkspec.
Fixed install docs for Qt for Symbian on Linux.
Performance docs.
Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713
Check for binding having been deleted in more places
Position GridView and ListView footer correctly when model cleared.
Clean up particle motion documentation
Finish QML for Qt Programmers section
Distinguish Qt Quick, Qt Declarative and QML on the landing page
Split responsibilities in QDeclarativeExpression more cleanly
improvements to docs and examples
Fix test for get() to check for undefined return values
Enter key performs same action as Return key in QML demos.
Revert "Making network reconnect happen after teardown."
Revert "Adding some error checking for setdefaultif"
Fixed a possible hanging bug in the Symbian networking.
Fixed a network hanging bug on Symbian.
...
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_symbian-introduction.qdoc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 985f3da..c46159c 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -263,7 +263,7 @@ make //! [40] //! [41] -cd src/s60installs +cd src make sis //! [41] 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] |