diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-23 08:18:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-23 08:18:51 +0200 |
| commit | f06482ca7f36d18f433aa9509521ee57dbb2b471 (patch) | |
| tree | 8c74534e3e4be8a27154aaf5b1905e3d4b72e277 | |
| parent | 405f2c7d88397371f5c91bb0abf3aa2e97edd00d (diff) | |
| parent | b57ac109a2509950bdc0650f21f42214ab0b347e (diff) | |
Merge remote-tracking branch 'origin/3.4' into 3.5
| -rw-r--r-- | doc/src/linux-mobile/linuxdev.qdoc | 8 | ||||
| m--------- | src/shared/qbs | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index b6853f43eb..be23dc6aa5 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -77,18 +77,18 @@ \li In the \uicontrol {The device's host name or IP address} field, enter the host name or IP address of the device. - This value will be available in the variable \c %{CurrentDevice:HostAddress}. + This value will be available in the variable \c %{Device:HostAddress}. \li In the \uicontrol {The username to log into the device} field, enter the username to log into the device and run the application as. - This value will be available in the variable \c %{CurrentDevice:UserName}. + This value will be available in the variable \c %{Device:UserName}. \li In the \uicontrol {The authentication type} field, select whether to use \uicontrol Password or \uicontrol Key authentication, and enter the user's password or the file that contains the user's private key. - The latter will be available in the variable \c %{CurrentDevice:PrivateKeyFile}. + The latter will be available in the variable \c %{Device:PrivateKeyFile}. \li Click \uicontrol {Next} to create the connection. @@ -96,7 +96,7 @@ All of these parameters can be edited later, as well as additional ones that the wizard does not show because there are sensible default values. One of these is - the SSH port number, which is available in the variable \c %{CurrentDevice:SshPort}. + the SSH port number, which is available in the variable \c %{Device:SshPort}. \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 9309633cb821643be1366f6c87ec31b55e26be0 +Subproject 0832785797f5db4e2f23833e08be0c023b6c9cc |