From 2e042b6ad2310766577017850e523215b28adaba Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 17 Jun 2015 15:53:18 +0200 Subject: [PATCH 1/4] Update qbs submodule. To HEAD of 1.4 branch. Change-Id: Ifc6ad172a2ae10d8461e9ebeaea2dc9396fd6daa Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 9309633cb82..e9bd0dd08a0 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 9309633cb821643be1366f6c87ec31b55e26be09 +Subproject commit e9bd0dd08a080dd470593a0abfd9cfa27821752a From 069ee3f3d2907ec548f6c1a5c67297232622de2b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Jun 2015 12:37:13 +0200 Subject: [PATCH 2/4] Update qbs submodule. To HEAD of 1.4 branch. Change-Id: I64a6099bf67d4705c657e36f6c79d53c33729d13 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index e9bd0dd08a0..a5b77c574ae 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit e9bd0dd08a080dd470593a0abfd9cfa27821752a +Subproject commit a5b77c574ae5876cdb348bded7a3e091fe2f85bf From ab7099cdb0781e39565cb441b1e8f64ca1668182 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Jun 2015 14:12:09 +0200 Subject: [PATCH 3/4] Update qbs submodule. Fixes MSVC 2010 build. Change-Id: Ia4a15e2d289b288c77fc5e52d717cb0d1a1960da Reviewed-by: Robert Loehning --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index a5b77c574ae..0832785797f 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit a5b77c574ae5876cdb348bded7a3e091fe2f85bf +Subproject commit 0832785797f5db4e2f23833e08be0c023b6c9cc2 From b57ac109a2509950bdc0650f21f42214ab0b347e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 22 Jun 2015 13:58:00 +0200 Subject: [PATCH 4/4] Documentation: Describe the non-prefixed "Device:*" variables. These are the ones that people should use in build steps and such. Task-number: QTCREATORBUG-14614 Change-Id: I398ee57a0338c16f41dd190abe3fc9b055a50132 Reviewed-by: hjk Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen --- doc/src/linux-mobile/linuxdev.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 2a8c88a379f..337d9006bbd 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}