summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/blackberryndksettingswidget.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
commit9f831dde07cb2411808534e76669b28a1b76e21d (patch)
treeed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/qnx/blackberryndksettingswidget.cpp
parentcdac81f896ef4b052d76f96485a08e6ec13696b8 (diff)
parentea1a92484ac99057b06130a012164bf9788650e9 (diff)
downloadqt-creator-wip/clang.tar.gz
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/qnx/blackberryndksettingswidget.cpp')
-rw-r--r--src/plugins/qnx/blackberryndksettingswidget.cpp12
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);
}