diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 13:23:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 13:23:40 (GMT) |
| commit | 198d903fa18d9f1d51615974d71de8236e97c2cd (patch) | |
| tree | 5e30b5b3c5c218d5ca1c3c91c5702ce326a7089b /doc/src/snippets/code | |
| parent | 22c01928872db30bd47c740abd714989ac910b95 (diff) | |
| parent | 146f97525ca49822bb684e1e4d9e62ff5484da36 (diff) | |
| download | Qt-198d903fa18d9f1d51615974d71de8236e97c2cd.zip Qt-198d903fa18d9f1d51615974d71de8236e97c2cd.tar.gz Qt-198d903fa18d9f1d51615974d71de8236e97c2cd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Doc: Updated the configuration file to use the Qt 4.7 style sheets.
Doc: Added more hints for building Qt for Symbian on Linux.
Doc: reintroducing QML elements table temporarily
Doc: adding html clasnames to the next and previous links
qdoc: Remove leading QML: text from certain node names.
Doc: Attempt to document content handling in Flickable.
Doc: Removed note about some Qt classes working without an application.
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 0593567..2e59db9 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -301,11 +301,24 @@ make runonphone -s lib/Qt.sis //! [47] +//! [runonphone with device file path] +runonphone -s lib/Qt.sis -p /dev/ttyUSB1 +//! [runonphone with device file path] + //! [48] cd demos/embedded/fluidlauncher runonphone -s fluidlauncher.sis fluidlauncher.exe //! [48] +//! [make runonphone with options] +make runonphone "QT_RUN_ON_PHONE_OPTIONS=-p /dev/ttyUSB1" +//! [make runonphone with options] + +//! [make runonphone with preset environment variable] +export QT_RUN_ON_PHONE_OPTIONS="-p /dev/ttyUSB1" +make runonphone +//! [make runonphone with preset environment variable] + //! [49] cd myapp qmake |