diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-08 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-08 23:00:11 (GMT) |
| commit | 9c0b958cac97db37433e0bec33974eb8c964531f (patch) | |
| tree | c923da04691486fc1d523ab7bb18771868ead352 /doc/src/snippets/code | |
| parent | 2c74c74a4b9fca65624d72525066501be9b50142 (diff) | |
| parent | 198d903fa18d9f1d51615974d71de8236e97c2cd (diff) | |
| download | Qt-9c0b958cac97db37433e0bec33974eb8c964531f.zip Qt-9c0b958cac97db37433e0bec33974eb8c964531f.tar.gz Qt-9c0b958cac97db37433e0bec33974eb8c964531f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
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 |