3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp
index 3c8c37e98a..004de59acb 100644
--- a/src/plugins/qnx/qnxdevicetester.cpp
+++ b/src/plugins/qnx/qnxdevicetester.cpp
@@ -113,12 +113,12 @@ void QnxDeviceTester::handleGenericTestFinished(TestResult result)
     testNextCommand();
 }
 
-void QnxDeviceTester::handleProcessFinished(int exitStatus)
+void QnxDeviceTester::handleProcessFinished(const QString &error)
 {
     QTC_ASSERT(m_state == CommandsTest, return);
 
     const QString command = m_commandsToTest[m_currentCommandIndex];
-    if (exitStatus == QSsh::SshRemoteProcess::NormalExit) {
+    if (error.isEmpty()) {
         if (m_processRunner->processExitCode() == 0) {
             emit progressMessage(tr("%1 found.").arg(command) + QLatin1Char('\n'));
         } else {
diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h
index 67acf1c776..91d5548bda 100644
--- a/src/plugins/qnx/qnxdevicetester.h
+++ b/src/plugins/qnx/qnxdevicetester.h
@@ -46,7 +46,7 @@ public:
 private slots:
     void handleGenericTestFinished(ProjectExplorer::DeviceTester::TestResult result);
 
-    void handleProcessFinished(int exitStatus);
+    void handleProcessFinished(const QString &error);
     void handleConnectionError();
 
 private:
diff --git a/src/plugins/qnx/qnxdevicewizard.cpp b/src/plugins/qnx/qnxdevicewizard.cpp
index 58b71f9586..2ca8968388 100644
--- a/src/plugins/qnx/qnxdevicewizard.cpp
+++ b/src/plugins/qnx/qnxdevicewizard.cpp
@@ -63,12 +63,10 @@ QnxDeviceWizard::QnxDeviceWizard(QWidget *parent) :
 IDevice::Ptr QnxDeviceWizard::device()
 {
     QSsh::SshConnectionParameters sshParams;
-    sshParams.options = QSsh::SshIgnoreDefaultProxy;
     sshParams.url = m_setupPage->url();
     sshParams.timeout = 10;
     sshParams.authenticationType = m_setupPage->authenticationType();
-    if (sshParams.authenticationType != QSsh::SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods
-            && sshParams.authenticationType != QSsh::SshConnectionParameters::AuthenticationTypePassword)
+    if (sshParams.authenticationType == QSsh::SshConnectionParameters::AuthenticationTypeSpecificKey)
         sshParams.privateKeyFile = m_setupPage->privateKeyFilePath();
 
     QnxDevice::Ptr device = QnxDevice::create(m_setupPage->configurationName(),