From f9212100536c923442c2a2c5c76b40c550067de2 Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Thu, 21 Nov 2013 15:43:13 +0100 Subject: Qnx: Sort configurations per version number Change-Id: I52b656ebc1134c25941348769d7de4dc5286bdda Reviewed-by: Tobias Hunger --- src/plugins/qnx/blackberryndksettingswidget.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/plugins/qnx/blackberryndksettingswidget.cpp') diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index a1982539e7..de37a19420 100644 --- a/src/plugins/qnx/blackberryndksettingswidget.cpp +++ b/src/plugins/qnx/blackberryndksettingswidget.cpp @@ -148,16 +148,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); } -- cgit v1.2.1 From 3851ec290b74dc896d4d29e37de511125ed4adca Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Wed, 27 Nov 2013 12:27:04 +0100 Subject: Qnx: Update target list after Environment Setup Wizard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTCREATORBUG-10795 Change-Id: Ia158370a00762190fa4b209e27c52c2ef32e5819 Reviewed-by: Rafael Roquetto Reviewed-by: Tobias Nätterlund Reviewed-by: Nicolas Arnaud-Cormos Reviewed-by: Eike Ziller --- src/plugins/qnx/blackberryndksettingswidget.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/plugins/qnx/blackberryndksettingswidget.cpp') diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index a1982539e7..bd532bb345 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(); } -- cgit v1.2.1