forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Eike Ziller
parent
4b19bdd6f1
commit
3851ec290b
@@ -124,6 +124,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
BlackBerrySetupWizard wizard;
|
BlackBerrySetupWizard wizard;
|
||||||
|
connect(&wizard, SIGNAL(ndkTargetsUpdated()), this, SLOT(updateNdkList()));
|
||||||
wizard.exec();
|
wizard.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -93,6 +93,8 @@ BlackBerrySetupWizard::BlackBerrySetupWizard(QWidget *parent) :
|
|||||||
m_uploader = new BlackBerryDebugTokenUploader(this);
|
m_uploader = new BlackBerryDebugTokenUploader(this);
|
||||||
m_keyGenerator = new QSsh::SshKeyGenerator;
|
m_keyGenerator = new QSsh::SshKeyGenerator;
|
||||||
|
|
||||||
|
connect(m_ndkPage, SIGNAL(targetsUpdated()),
|
||||||
|
this, SIGNAL(ndkTargetsUpdated()));
|
||||||
connect(m_deviceInfo, SIGNAL(finished(int)),
|
connect(m_deviceInfo, SIGNAL(finished(int)),
|
||||||
this, SLOT(deviceInfoFinished(int)));
|
this, SLOT(deviceInfoFinished(int)));
|
||||||
connect(m_requester, SIGNAL(finished(int)),
|
connect(m_requester, SIGNAL(finished(int)),
|
||||||
|
@@ -69,6 +69,7 @@ public slots:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void stepFinished();
|
void stepFinished();
|
||||||
|
void ndkTargetsUpdated();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void processNextStep();
|
void processNextStep();
|
||||||
|
@@ -87,6 +87,7 @@ BlackBerrySetupWizardNdkPage::BlackBerrySetupWizardNdkPage(QWidget *parent) :
|
|||||||
m_widget->setWizardMessageVisible(false);
|
m_widget->setWizardMessageVisible(false);
|
||||||
|
|
||||||
connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(completeChanged()));
|
connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(completeChanged()));
|
||||||
|
connect(m_widget, SIGNAL(targetsUpdated()), this, SIGNAL(targetsUpdated()));
|
||||||
|
|
||||||
QVBoxLayout *layout = new QVBoxLayout;
|
QVBoxLayout *layout = new QVBoxLayout;
|
||||||
layout->addWidget(m_widget);
|
layout->addWidget(m_widget);
|
||||||
|
@@ -70,6 +70,9 @@ public:
|
|||||||
|
|
||||||
bool isComplete() const;
|
bool isComplete() const;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void targetsUpdated();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
BlackBerryNDKSettingsWidget *m_widget;
|
BlackBerryNDKSettingsWidget *m_widget;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user