Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 2 insertions, 10 deletions

diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp
index a1982539e7..c620e334e6 100644
--- a/src/plugins/qnx/blackberryndksettingswidget.cpp
+++ b/src/plugins/qnx/blackberryndksettingswidget.cpp
@@ -124,6 +124,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const
     }
 
     BlackBerrySetupWizard wizard;
+    connect(&wizard, SIGNAL(ndkTargetsUpdated()), this, SLOT(updateNdkList()));
     wizard.exec();
 }
 
@@ -148,16 +149,7 @@ void BlackBerryNDKSettingsWidget::updateInfoTable(QTreeWidgetItem* currentItem)
     m_ui->ndkPathLabel->setText(QDir::toNativeSeparators(config->ndkPath()));
     m_ui->hostLabel->setText(QDir::toNativeSeparators(config->qnxHost()));
     m_ui->targetLabel->setText(QDir::toNativeSeparators(config->sysRoot().toString()));
-    m_ui->versionLabel->clear();
-    // TODO: Add a versionNumber attribute for the BlackBerryConfiguration class
-    if (config->isAutoDetected()) {
-        foreach (const NdkInstallInformation &ndkInfo, QnxUtils::installedNdks()) {
-            if (ndkInfo.name == config->displayName()) {
-                m_ui->versionLabel->setText(ndkInfo.version);
-                break;
-            }
-        }
-    }
+    m_ui->versionLabel->setText(config->version().toString());
 
     updateUi(currentItem, config);
 }