Commit 229ca098 authored by Tobias Nätterlund's avatar Tobias Nätterlund Committed by Tobias Nätterlund
Browse files

QNX: Fix continuing the BlackBerry environment setup wizard



This fixes an issue that wouldn't let you continue in the
BlackBerry environment setup wizard after installing an NDK.

Task-number: QTCREATORBUG-10675
Change-Id: Id36f9ea95793f04d21304d92b2a2d0de675546f1
Reviewed-by: default avatarMehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent fefbc172
...@@ -184,6 +184,7 @@ void BlackBerryNDKSettingsWidget::updateNdkList() ...@@ -184,6 +184,7 @@ void BlackBerryNDKSettingsWidget::updateNdkList()
void BlackBerryNDKSettingsWidget::addNdkTarget() void BlackBerryNDKSettingsWidget::addNdkTarget()
{ {
launchBlackBerryInstallerWizard(BlackBerryInstallerDataHandler::InstallMode); launchBlackBerryInstallerWizard(BlackBerryInstallerDataHandler::InstallMode);
emit targetsUpdated();
} }
void BlackBerryNDKSettingsWidget::removeNdkTarget() void BlackBerryNDKSettingsWidget::removeNdkTarget()
...@@ -200,6 +201,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget() ...@@ -200,6 +201,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget()
if (config->isAutoDetected()) { if (config->isAutoDetected()) {
uninstallNdkTarget(); uninstallNdkTarget();
emit targetsUpdated();
return; return;
} }
...@@ -214,6 +216,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget() ...@@ -214,6 +216,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget()
m_deactivatedTargets.removeOne(config); m_deactivatedTargets.removeOne(config);
m_bbConfigManager->removeConfiguration(config); m_bbConfigManager->removeConfiguration(config);
m_manualNdks->removeChild(m_ui->ndksTreeWidget->currentItem()); m_manualNdks->removeChild(m_ui->ndksTreeWidget->currentItem());
emit targetsUpdated();
} }
} }
...@@ -231,6 +234,7 @@ void BlackBerryNDKSettingsWidget::activateNdkTarget() ...@@ -231,6 +234,7 @@ void BlackBerryNDKSettingsWidget::activateNdkTarget()
m_deactivatedTargets.removeAt(m_deactivatedTargets.indexOf(config)); m_deactivatedTargets.removeAt(m_deactivatedTargets.indexOf(config));
updateUi(m_ui->ndksTreeWidget->currentItem(), config); updateUi(m_ui->ndksTreeWidget->currentItem(), config);
emit targetsUpdated();
} }
} }
...@@ -246,6 +250,7 @@ void BlackBerryNDKSettingsWidget::deactivateNdkTarget() ...@@ -246,6 +250,7 @@ void BlackBerryNDKSettingsWidget::deactivateNdkTarget()
m_deactivatedTargets << config; m_deactivatedTargets << config;
m_activatedTargets.removeAt(m_activatedTargets.indexOf(config)); m_activatedTargets.removeAt(m_activatedTargets.indexOf(config));
updateUi(m_ui->ndksTreeWidget->currentItem(), config); updateUi(m_ui->ndksTreeWidget->currentItem(), config);
emit targetsUpdated();
} }
} }
......
...@@ -62,7 +62,7 @@ public: ...@@ -62,7 +62,7 @@ public:
QList<BlackBerryConfiguration *> deactivatedTargets(); QList<BlackBerryConfiguration *> deactivatedTargets();
signals: signals:
void kitsUpdated(); void targetsUpdated();
public slots: public slots:
void launchBlackBerrySetupWizard() const; void launchBlackBerrySetupWizard() const;
......
...@@ -86,7 +86,7 @@ BlackBerrySetupWizardNdkPage::BlackBerrySetupWizardNdkPage(QWidget *parent) : ...@@ -86,7 +86,7 @@ BlackBerrySetupWizardNdkPage::BlackBerrySetupWizardNdkPage(QWidget *parent) :
m_widget = new BlackBerryNDKSettingsWidget(this); m_widget = new BlackBerryNDKSettingsWidget(this);
m_widget->setWizardMessageVisible(false); m_widget->setWizardMessageVisible(false);
connect(m_widget, SIGNAL(kitsUpdated()), this, SIGNAL(completeChanged())); connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(completeChanged()));
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(m_widget); layout->addWidget(m_widget);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment