From 3851ec290b74dc896d4d29e37de511125ed4adca Mon Sep 17 00:00:00 2001 From: El Mehdi Fekari Date: Wed, 27 Nov 2013 12:27:04 +0100 Subject: [PATCH] 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 + src/plugins/qnx/blackberrysetupwizard.cpp | 2 ++ src/plugins/qnx/blackberrysetupwizard.h | 1 + src/plugins/qnx/blackberrysetupwizardpages.cpp | 1 + src/plugins/qnx/blackberrysetupwizardpages.h | 3 +++ 5 files changed, 8 insertions(+) diff --git a/src/plugins/qnx/blackberryndksettingswidget.cpp b/src/plugins/qnx/blackberryndksettingswidget.cpp index a1982539e7e..bd532bb3458 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 e5214b0a0f3..748b7a0b3a7 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 a224ed6487c..a1e39873f5e 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 5d088de19e0..fd66057119c 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 ba586a3da44..75a00524e1b 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; };