Combine some SshConnectionParameter members

Combine host, port, username and password into a 'url' member and
add some convenience accessors.

Change-Id: Iddc26ff00dad1285c96aa56f196dbc4febe8e974
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/plugins/qnx/qnxdevicewizard.cpp b/src/plugins/qnx/qnxdevicewizard.cpp
index cbfc872049..9137cc13a0 100644
--- a/src/plugins/qnx/qnxdevicewizard.cpp
+++ b/src/plugins/qnx/qnxdevicewizard.cpp
@@ -64,15 +64,11 @@ IDevice::Ptr QnxDeviceWizard::device()
 {
     QSsh::SshConnectionParameters sshParams;
     sshParams.options = QSsh::SshIgnoreDefaultProxy;
-    sshParams.host = m_setupPage->hostName();
-    sshParams.userName = m_setupPage->userName();
-    sshParams.port = 22;
+    sshParams.url = m_setupPage->url();
     sshParams.timeout = 10;
     sshParams.authenticationType = m_setupPage->authenticationType();
-    if (sshParams.authenticationType == QSsh::SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods
-        || sshParams.authenticationType == QSsh::SshConnectionParameters::AuthenticationTypePassword)
-        sshParams.password = m_setupPage->password();
-    else
+    if (sshParams.authenticationType != QSsh::SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods
+            && sshParams.authenticationType != QSsh::SshConnectionParameters::AuthenticationTypePassword)
         sshParams.privateKeyFile = m_setupPage->privateKeyFilePath();
 
     QnxDevice::Ptr device = QnxDevice::create(m_setupPage->configurationName(),