feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4' into 3.5

Browse Source
This commit is contained in:
Eike Ziller
2015-06-23 08:18:51 +02:00
parent 405f2c7d88 b57ac109a2
commit f06482ca7f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/linux-mobile/linuxdev.qdoc
View File

@@ -77,18 +77,18 @@
\li In the \uicontrol {The device's host name or IP address} field, \li In the \uicontrol {The device's host name or IP address} field,
enter the host name or IP address of the device. 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, \li In the \uicontrol {The username to log into the device} field,
enter the username to log into the device and run the enter the username to log into the device and run the
application as. 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 \li In the \uicontrol {The authentication type} field, select whether
to use \uicontrol Password or \uicontrol Key authentication, and enter to use \uicontrol Password or \uicontrol Key authentication, and enter
the user's password or the file that contains the user's the user's password or the file that contains the user's
private key. 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. \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 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 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} \li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run}

2
src/shared/qbs

Submodule src/shared/qbs updated: 9309633cb8...0832785797