Qnx: Update target list after Environment Setup Wizard

Task-number: QTCREATORBUG-10795

Change-Id: Ia158370a00762190fa4b209e27c52c2ef32e5819
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

5 files changed, 8 insertions, 0 deletions

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();
 }
 
diff --git a/src/plugins/qnx/blackberrysetupwizard.cpp b/src/plugins/qnx/blackberrysetupwizard.cpp
index e5214b0a0f..748b7a0b3a 100644
--- a/src/plugins/qnx/blackberrysetupwizard.cpp
+++ b/src/plugins/qnx/blackberrysetupwizard.cpp
@@ -93,6 +93,8 @@ BlackBerrySetupWizard::BlackBerrySetupWizard(QWidget *parent) :
     m_uploader = new BlackBerryDebugTokenUploader(this);
     m_keyGenerator = new QSsh::SshKeyGenerator;
 
+    connect(m_ndkPage, SIGNAL(targetsUpdated()),
+            this, SIGNAL(ndkTargetsUpdated()));
     connect(m_deviceInfo, SIGNAL(finished(int)),
             this, SLOT(deviceInfoFinished(int)));
     connect(m_requester, SIGNAL(finished(int)),
diff --git a/src/plugins/qnx/blackberrysetupwizard.h b/src/plugins/qnx/blackberrysetupwizard.h
index a224ed6487..a1e39873f5 100644
--- a/src/plugins/qnx/blackberrysetupwizard.h
+++ b/src/plugins/qnx/blackberrysetupwizard.h
@@ -69,6 +69,7 @@ public slots:
 
 signals:
     void stepFinished();
+    void ndkTargetsUpdated();
 
 private slots:
     void processNextStep();
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.cpp b/src/plugins/qnx/blackberrysetupwizardpages.cpp
index 5d088de19e..fd66057119 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.cpp
+++ b/src/plugins/qnx/blackberrysetupwizardpages.cpp
@@ -87,6 +87,7 @@ BlackBerrySetupWizardNdkPage::BlackBerrySetupWizardNdkPage(QWidget *parent) :
     m_widget->setWizardMessageVisible(false);
 
     connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(completeChanged()));
+    connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(targetsUpdated()));
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(m_widget);
diff --git a/src/plugins/qnx/blackberrysetupwizardpages.h b/src/plugins/qnx/blackberrysetupwizardpages.h
index ba586a3da4..75a00524e1 100644
--- a/src/plugins/qnx/blackberrysetupwizardpages.h
+++ b/src/plugins/qnx/blackberrysetupwizardpages.h
@@ -70,6 +70,9 @@ public:
 
     bool isComplete() const;
 
+signals:
+    void targetsUpdated();
+
 private:
     BlackBerryNDKSettingsWidget *m_widget;
 };