diff --git a/src/plugins/qnx/blackberrydeviceconfiguration.cpp b/src/plugins/qnx/blackberrydeviceconfiguration.cpp index 7fd5ac04742..0d3ca734225 100644 --- a/src/plugins/qnx/blackberrydeviceconfiguration.cpp +++ b/src/plugins/qnx/blackberrydeviceconfiguration.cpp @@ -98,6 +98,13 @@ IDevice::Ptr BlackBerryDeviceConfiguration::clone() const return Ptr(new BlackBerryDeviceConfiguration(*this)); } +bool BlackBerryDeviceConfiguration::hasDeviceTester() const +{ + // we are unable to easily verify that a device is available unless we duplicate + // 'Connect to device' functionality, therefore disabling device-tester + return false; +} + BlackBerryDeviceConfiguration::ConstPtr BlackBerryDeviceConfiguration::device(const Kit *k) { IDevice::ConstPtr dev = DeviceKitInformation::device(k); diff --git a/src/plugins/qnx/blackberrydeviceconfiguration.h b/src/plugins/qnx/blackberrydeviceconfiguration.h index 154dc0af2ef..50b35eb84a1 100644 --- a/src/plugins/qnx/blackberrydeviceconfiguration.h +++ b/src/plugins/qnx/blackberrydeviceconfiguration.h @@ -64,6 +64,7 @@ public: QString displayNameForActionId(Core::Id actionId) const; void executeAction(Core::Id actionId, QWidget *parent) const; ProjectExplorer::IDevice::Ptr clone() const; + bool hasDeviceTester() const; static ConstPtr device(const ProjectExplorer::Kit *k); diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizard.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizard.cpp index c407b082b18..73f9e36a350 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizard.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizard.cpp @@ -33,6 +33,7 @@ #include "blackberrydeviceconfigurationwizardpages.h" #include "qnxconstants.h" #include "blackberrydeviceconfiguration.h" +#include "blackberrydeviceconnectionmanager.h" #include @@ -46,13 +47,11 @@ BlackBerryDeviceConfigurationWizard::BlackBerryDeviceConfigurationWizard(QWidget m_setupPage = new BlackBerryDeviceConfigurationWizardSetupPage(this); m_queryPage = new BlackBerryDeviceConfigurationWizardQueryPage(m_holder, this); - m_sshKeyPage = new BlackBerryDeviceConfigurationWizardSshKeyPage(this); m_configPage = new BlackBerryDeviceConfigurationWizardConfigPage(m_holder, this); m_finalPage = new BlackBerryDeviceConfigurationWizardFinalPage(this); setPage(SetupPageId, m_setupPage); setPage(QueryPageId, m_queryPage); - setPage(SshKeyPageId, m_sshKeyPage); setPage(ConfigPageId, m_configPage); setPage(FinalPageId, m_finalPage); m_finalPage->setCommitPage(true); @@ -65,7 +64,7 @@ ProjectExplorer::IDevice::Ptr BlackBerryDeviceConfigurationWizard::device() sshParams.host = m_setupPage->hostName(); sshParams.password = m_setupPage->password(); sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationTypePublicKey; - sshParams.privateKeyFile = m_sshKeyPage->privateKey(); + sshParams.privateKeyFile = BlackBerryDeviceConnectionManager::instance()->privateKeyPath(); sshParams.userName = QLatin1String("devuser"); sshParams.timeout = 10; sshParams.port = 22; diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizard.h b/src/plugins/qnx/blackberrydeviceconfigurationwizard.h index 5b4a7a9cd16..024e9eb8550 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizard.h +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizard.h @@ -53,14 +53,12 @@ private: enum PageId { SetupPageId, QueryPageId, - SshKeyPageId, ConfigPageId, FinalPageId }; BlackBerryDeviceConfigurationWizardSetupPage *m_setupPage; BlackBerryDeviceConfigurationWizardQueryPage *m_queryPage; - BlackBerryDeviceConfigurationWizardSshKeyPage *m_sshKeyPage; BlackBerryDeviceConfigurationWizardConfigPage *m_configPage; BlackBerryDeviceConfigurationWizardFinalPage *m_finalPage; diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp index 1474f10372f..2261c73ff82 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp @@ -39,6 +39,7 @@ #include "ui_blackberrydeviceconfigurationwizardsshkeypage.h" #include "ui_blackberrydeviceconfigurationwizardconfigpage.h" #include "blackberryconfiguration.h" +#include "blackberrydeviceconnectionmanager.h" #include "qnxutils.h" #include @@ -151,8 +152,6 @@ void BlackBerryDeviceConfigurationWizardSetupPage::onDeviceSelectionChanged() QList selectedItems = m_ui->deviceListWidget->selectedItems(); const QListWidgetItem *selected = selectedItems.count() == 1 ? selectedItems[0] : 0; const ItemKind itemKind = selected ? selected->data(ItemKindRole).value() : Note; - const bool isSimulator = selected && itemKind == Autodetected - ? selected->data(DeviceTypeRole).toBool() : false; switch (itemKind) { case SpecifyManually: m_ui->deviceHostIp->setEnabled(true); @@ -228,6 +227,7 @@ BlackBerryDeviceConfigurationWizardQueryPage::BlackBerryDeviceConfigurationWizar { m_ui->setupUi(this); setTitle(tr("Query Device Information")); + m_ui->progressBar->setMaximum(Done); connect(m_deviceInformation,SIGNAL(finished(int)),this,SLOT(processQueryFinished(int))); } @@ -240,11 +240,10 @@ BlackBerryDeviceConfigurationWizardQueryPage::~BlackBerryDeviceConfigurationWiza void BlackBerryDeviceConfigurationWizardQueryPage::initializePage() { - m_ui->statusLabel->setText(tr("Querying device information. Please wait...")); - m_ui->progressBar->setVisible(true); - m_holder.deviceInfoRetrieved = false; + setState(Querying, tr("Querying device information. Please wait...")); + m_deviceInformation->setDeviceTarget( field(QLatin1String(DEVICEHOSTNAME_FIELD_ID)).toString(), field(QLatin1String(DEVICEPASSWORD_FIELD_ID)).toString()); @@ -261,148 +260,86 @@ void BlackBerryDeviceConfigurationWizardQueryPage::processQueryFinished(int stat m_holder.isSimulator = m_deviceInformation->isSimulator(); if (m_holder.deviceInfoRetrieved) - m_ui->statusLabel->setText(tr("Device information retrieved successfully.")); + checkAndGenerateSSHKeys(); else - m_ui->statusLabel->setText(tr("Cannot connect to the device. Check if the device is in development mode and has matching host name and password.")); - m_ui->progressBar->setVisible(false); + setState(Done, tr("Cannot connect to the device. " + "Check if the device is in development mode and has matching host name and password.")); +} + +void BlackBerryDeviceConfigurationWizardQueryPage::checkAndGenerateSSHKeys() +{ + if (! BlackBerryDeviceConnectionManager::instance()->hasValidSSHKeys()) { + setState(GeneratingSshKey, tr("Generating SSH keys. Please wait...")); + + BlackBerrySshKeysGenerator *sshKeysGenerator = new BlackBerrySshKeysGenerator(); + connect(sshKeysGenerator, SIGNAL(sshKeysGenerationFailed(QString)), + this, SLOT(sshKeysGenerationFailed(QString)), Qt::QueuedConnection); + connect(sshKeysGenerator, SIGNAL(sshKeysGenerationFinished(QByteArray,QByteArray)), + this, SLOT(processSshKeys(QByteArray,QByteArray)), Qt::QueuedConnection); + sshKeysGenerator->start(); + } else + queryDone(); +} + +void BlackBerryDeviceConfigurationWizardQueryPage::sshKeysGenerationFailed(const QString &error) +{ + // this slot can be called asynchronously - processing it only in GeneratingSshKey state + if (m_state != GeneratingSshKey) + return; + + QString message = tr("Failed generating SSH key needed for securing connection to a device. Error: "); + message.append(error); + setState(Done, message); +} + +void BlackBerryDeviceConfigurationWizardQueryPage::processSshKeys(const QByteArray &privateKey, + const QByteArray &publicKey) +{ + // this slot can be called asynchronously - processing it only in GeneratingSshKey state + if (m_state != GeneratingSshKey) + return; + + // condition prevents overriding already generated SSH keys + // this may happens when an user enter the QueryPage several times before + // the first SSH keys are generated i.e. when multiple calls of checkAndGenerateSSHKeys() + // before processSshKeys() is called, multiple processSshKeys() calls are triggered later. + // only the first one is allowed to write the SSH keys. + if (! BlackBerryDeviceConnectionManager::instance()->hasValidSSHKeys()) { + QString error; + if (!BlackBerryDeviceConnectionManager::instance()->setSSHKeys(privateKey, publicKey, &error)) { + QString message = tr("Failed saving SSH key needed for securing connection to a device. Error: "); + message.append(error); + setState(Done, message); + return; + } + } + + queryDone(); +} + +void BlackBerryDeviceConfigurationWizardQueryPage::queryDone() +{ + setState(Done, tr("Device information retrieved successfully.")); +} + +void BlackBerryDeviceConfigurationWizardQueryPage::setState(QueryState state, const QString &message) +{ + m_state = state; + m_ui->statusLabel->setText(message); + m_ui->progressBar->setVisible(state != Done); + m_ui->progressBar->setValue(state); emit completeChanged(); - if (m_holder.deviceInfoRetrieved) - wizard()->next(); + if (isComplete()) + if (wizard()->currentPage() == this) + wizard()->next(); } bool BlackBerryDeviceConfigurationWizardQueryPage::isComplete() const { - return m_holder.deviceInfoRetrieved; -} - -// ---------------------------------------------------------------------------- - -BlackBerryDeviceConfigurationWizardSshKeyPage::BlackBerryDeviceConfigurationWizardSshKeyPage(QWidget *parent) - : QWizardPage(parent) - , m_ui(new Ui::BlackBerryDeviceConfigurationWizardSshKeyPage) -{ - m_ui->setupUi(this); - - m_ui->privateKey->setExpectedKind(Utils::PathChooser::File); - m_ui->progressBar->hide(); - - QString initialBrowsePath = QnxUtils::dataDirPath(); - if (!QFileInfo(initialBrowsePath).exists()) - initialBrowsePath = QDir::homePath(); - m_ui->privateKey->setInitialBrowsePathBackup(initialBrowsePath); - - setTitle(tr("SSH Key Setup")); - setSubTitle(tr("Please select an existing 4096-bit key or click Generate to create a new one.")); - - connect(m_ui->privateKey, SIGNAL(changed(QString)), this, SLOT(findMatchingPublicKey(QString))); - connect(m_ui->privateKey, SIGNAL(changed(QString)), this, SIGNAL(completeChanged())); - connect(m_ui->generate, SIGNAL(clicked()), this, SLOT(generateSshKeys())); -} - -BlackBerryDeviceConfigurationWizardSshKeyPage::~BlackBerryDeviceConfigurationWizardSshKeyPage() -{ - delete m_ui; - m_ui = 0; -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::initializePage() -{ -} - -bool BlackBerryDeviceConfigurationWizardSshKeyPage::isComplete() const -{ - QFileInfo privateKeyFi(m_ui->privateKey->fileName().toString()); - QFileInfo publicKeyFi(m_ui->publicKey->text()); - - return privateKeyFi.exists() && publicKeyFi.exists(); -} - -QString BlackBerryDeviceConfigurationWizardSshKeyPage::privateKey() const -{ - return m_ui->privateKey->fileName().toString(); -} - -QString BlackBerryDeviceConfigurationWizardSshKeyPage::publicKey() const -{ - return m_ui->publicKey->text(); -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::findMatchingPublicKey(const QString &privateKeyPath) -{ - const QString candidate = privateKeyPath + QLatin1String(".pub"); - if (QFileInfo(candidate).exists()) - m_ui->publicKey->setText(QDir::toNativeSeparators(candidate)); - else - m_ui->publicKey->clear(); -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::sshKeysGenerationFailed(const QString &error) -{ - setBusy(false); - QMessageBox::critical(this, tr("Key Generation Failed"), error); -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::processSshKeys(const QString &privateKeyPath, const QByteArray &privateKey, const QByteArray &publicKey) -{ - setBusy(false); - - const QString publicKeyPath = privateKeyPath + QLatin1String(".pub"); - - if (!saveKeys(privateKey, publicKey, privateKeyPath, publicKeyPath)) // saveKeys(..) will show an error message if necessary - return; - - m_ui->privateKey->setFileName(Utils::FileName::fromString(privateKeyPath)); - m_ui->publicKey->setText(QDir::toNativeSeparators(publicKeyPath)); - - emit completeChanged(); -} - -bool BlackBerryDeviceConfigurationWizardSshKeyPage::saveKeys(const QByteArray &privateKey, const QByteArray &publicKey, const QString &privateKeyPath, const QString &publicKeyPath) -{ - Utils::FileSaver privSaver(privateKeyPath); - privSaver.write(privateKey); - if (!privSaver.finalize(this)) - return false; // finalize shows an error message if necessary - QFile::setPermissions(privateKeyPath, QFile::ReadOwner | QFile::WriteOwner); - - Utils::FileSaver pubSaver(publicKeyPath); - - pubSaver.write(publicKey); - if (!pubSaver.finalize(this)) - return false; - - return true; -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::generateSshKeys() -{ - QString lookInDir = QnxUtils::dataDirPath(); - if (!QFileInfo(lookInDir).exists()) - lookInDir = QDir::homePath(); - - QString privateKeyPath = QFileDialog::getSaveFileName(this, tr("Choose Private Key File Name"), lookInDir); - if (privateKeyPath.isEmpty()) - return; - - setBusy(true); - BlackBerrySshKeysGenerator *sshKeysGenerator = new BlackBerrySshKeysGenerator(privateKeyPath); - connect(sshKeysGenerator, SIGNAL(sshKeysGenerationFailed(QString)), this, SLOT(sshKeysGenerationFailed(QString)), Qt::QueuedConnection); - connect(sshKeysGenerator, SIGNAL(sshKeysGenerationFinished(QString,QByteArray,QByteArray)), this, SLOT(processSshKeys(QString,QByteArray,QByteArray)), Qt::QueuedConnection); - sshKeysGenerator->start(); -} - -void BlackBerryDeviceConfigurationWizardSshKeyPage::setBusy(bool busy) -{ - m_ui->privateKey->setEnabled(!busy); - m_ui->publicKey->setEnabled(!busy); - m_ui->generate->setEnabled(!busy); - m_ui->progressBar->setVisible(busy); - - wizard()->button(QWizard::BackButton)->setEnabled(!busy); - wizard()->button(QWizard::NextButton)->setEnabled(!busy); - wizard()->button(QWizard::FinishButton)->setEnabled(!busy); - wizard()->button(QWizard::CancelButton)->setEnabled(!busy); + return m_state == Done + && m_holder.deviceInfoRetrieved + && BlackBerryDeviceConnectionManager::instance()->hasValidSSHKeys(); } // ---------------------------------------------------------------------------- diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h index 482fa8d8d4e..79e549ca9d4 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h @@ -102,6 +102,11 @@ private: class BlackBerryDeviceConfigurationWizardQueryPage : public QWizardPage { Q_OBJECT + enum QueryState + { + Querying = 0, GeneratingSshKey, Done + }; + public: explicit BlackBerryDeviceConfigurationWizardQueryPage(BlackBerryDeviceConfigurationWizardHolder &holder, QWidget *parent = 0); ~BlackBerryDeviceConfigurationWizardQueryPage(); @@ -111,38 +116,18 @@ public: private slots: void processQueryFinished(int status); + void sshKeysGenerationFailed(const QString &error); + void processSshKeys(const QByteArray &privateKey, const QByteArray &publicKey); private: + void checkAndGenerateSSHKeys(); + void queryDone(); + void setState(QueryState state, const QString &message); + Ui::BlackBerryDeviceConfigurationWizardQueryPage *m_ui; BlackBerryDeviceConfigurationWizardHolder &m_holder; BlackBerryDeviceInformation *m_deviceInformation; -}; - -class BlackBerryDeviceConfigurationWizardSshKeyPage : public QWizardPage -{ - Q_OBJECT -public: - explicit BlackBerryDeviceConfigurationWizardSshKeyPage(QWidget *parent = 0); - ~BlackBerryDeviceConfigurationWizardSshKeyPage(); - - void initializePage(); - bool isComplete() const; - - QString privateKey() const; - QString publicKey() const; - -private slots: - void findMatchingPublicKey(const QString &privateKeyPath); - - void sshKeysGenerationFailed(const QString &error); - void processSshKeys(const QString &privateKeyPath, const QByteArray &privateKey, const QByteArray &publicKey); - void generateSshKeys(); - -private: - bool saveKeys(const QByteArray &privateKey, const QByteArray &publicKey, const QString &privateKeyPath, const QString &publicKeyPath); - void setBusy(bool busy); - - Ui::BlackBerryDeviceConfigurationWizardSshKeyPage *m_ui; + QueryState m_state; }; class BlackBerryDeviceConfigurationWizardConfigPage : public QWizardPage diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardquerypage.ui b/src/plugins/qnx/blackberrydeviceconfigurationwizardquerypage.ui index d27baba62a7..5286649f9d4 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardquerypage.ui +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardquerypage.ui @@ -25,11 +25,7 @@ - - - 0 - - + diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardsshkeypage.ui b/src/plugins/qnx/blackberrydeviceconfigurationwizardsshkeypage.ui deleted file mode 100644 index 7699fb3a0ab..00000000000 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardsshkeypage.ui +++ /dev/null @@ -1,110 +0,0 @@ - - - Qnx::Internal::BlackBerryDeviceConfigurationWizardSshKeyPage - - - - 0 - 0 - 409 - 185 - - - - WizardPage - - - - - - Private key file: - - - - - - - true - - - - - - - - - - - - Generate... - - - - - - - - - 0 - - - -1 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Public key file: - - - - - - - - true - - - - SSH public key is used for securing a connection to a device. - - - true - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - editingFinished() - browsingFinished() - - - - - generate - publicKey - - - - diff --git a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp index da19bc810d9..43551556786 100644 --- a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp +++ b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp @@ -35,10 +35,16 @@ #include "blackberrydeviceconnection.h" #include "qnxconstants.h" +#include #include #include +#include +#include #include +#include +#include + using namespace Qnx; using namespace Qnx::Internal; @@ -164,6 +170,59 @@ void BlackBerryDeviceConnectionManager::disconnectDevice(const ProjectExplorer:: disconnectDevice(device->id()); } +/*! + * @brief Returns default private key path in local settings. + * @return the default private key path + */ +const QString BlackBerryDeviceConnectionManager::privateKeyPath() const +{ + return QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + QLatin1String("/qtcreator/qnx/id_rsa"); +} + +/*! + * @brief Checks validity of default SSH keys used for connecting to a device. + * @return true, if the default SSH keys are valid + */ +bool BlackBerryDeviceConnectionManager::hasValidSSHKeys() const +{ + const QString privateKey = privateKeyPath(); + QFileInfo privateKeyFileInfo(privateKey); + QFileInfo publicKeyFileInfo(privateKey + QLatin1String(".pub")); + + return privateKeyFileInfo.exists() && privateKeyFileInfo.isReadable() + && publicKeyFileInfo.exists() && publicKeyFileInfo.isReadable(); +} + +/*! + * @brief Stores a new private and public SSH key in local settings. + * @param privateKeyContent the private key content + * @param publicKeyContent the public key content + */ +bool BlackBerryDeviceConnectionManager::setSSHKeys(const QByteArray privateKeyContent, + const QByteArray publicKeyContent, QString *error) +{ + const QString privateKey = privateKeyPath(); + const QString publicKey = privateKey + QLatin1String(".pub"); + + QFileInfo fileInfo(privateKey); + QDir dir = fileInfo.dir(); + if (!dir.exists()) + dir.mkpath(QLatin1String(".")); + + Utils::FileSaver privSaver(privateKey); + privSaver.write(privateKeyContent); + if (!privSaver.finalize(error)) + return false; + QFile::setPermissions(privateKey, QFile::ReadOwner | QFile::WriteOwner); + + Utils::FileSaver pubSaver(publicKey); + pubSaver.write(publicKeyContent); + if (!pubSaver.finalize(error)) + return false; + + return true; +} + void BlackBerryDeviceConnectionManager::disconnectDevice(Core::Id deviceId) { BlackBerryDeviceConnection *connection = m_connections.key(deviceId); diff --git a/src/plugins/qnx/blackberrydeviceconnectionmanager.h b/src/plugins/qnx/blackberrydeviceconnectionmanager.h index 36569c6c32e..ac2935062e0 100644 --- a/src/plugins/qnx/blackberrydeviceconnectionmanager.h +++ b/src/plugins/qnx/blackberrydeviceconnectionmanager.h @@ -60,6 +60,11 @@ public: void connectDevice(const ProjectExplorer::IDevice::ConstPtr &device); void disconnectDevice(const ProjectExplorer::IDevice::ConstPtr &device); + const QString privateKeyPath() const; + bool hasValidSSHKeys() const; + bool setSSHKeys(const QByteArray privateKeyContent, const QByteArray publicKeyContent, + QString *error); + signals: void connectionOutput(Core::Id deviceId, const QString &output); void deviceAboutToConnect(Core::Id deviceId); diff --git a/src/plugins/qnx/blackberrysshkeysgenerator.cpp b/src/plugins/qnx/blackberrysshkeysgenerator.cpp index d9b10c0b0f5..658b1c5e589 100644 --- a/src/plugins/qnx/blackberrysshkeysgenerator.cpp +++ b/src/plugins/qnx/blackberrysshkeysgenerator.cpp @@ -34,10 +34,9 @@ using namespace Qnx::Internal; -BlackBerrySshKeysGenerator::BlackBerrySshKeysGenerator(const QString &privateKeyPath) +BlackBerrySshKeysGenerator::BlackBerrySshKeysGenerator() : QThread(0) , m_keyGen(new QSsh::SshKeyGenerator) - , m_privateKeyPath(privateKeyPath) { connect(this, SIGNAL(finished()), this, SLOT(deleteLater())); } @@ -66,7 +65,7 @@ void BlackBerrySshKeysGenerator::run() publicKey.truncate(secondSpace); } - emit sshKeysGenerationFinished(m_privateKeyPath, m_keyGen->privateKey(), publicKey); + emit sshKeysGenerationFinished(m_keyGen->privateKey(), publicKey); } else emit sshKeysGenerationFailed(m_keyGen->error()); } diff --git a/src/plugins/qnx/blackberrysshkeysgenerator.h b/src/plugins/qnx/blackberrysshkeysgenerator.h index e732d5575ca..9c66c915112 100644 --- a/src/plugins/qnx/blackberrysshkeysgenerator.h +++ b/src/plugins/qnx/blackberrysshkeysgenerator.h @@ -44,16 +44,15 @@ class BlackBerrySshKeysGenerator : public QThread { Q_OBJECT public: - BlackBerrySshKeysGenerator(const QString &privateKeyPath); + BlackBerrySshKeysGenerator(); ~BlackBerrySshKeysGenerator(); signals: void sshKeysGenerationFailed(const QString &error); - void sshKeysGenerationFinished(const QString &privateKeyPath, const QByteArray &privateKey, const QByteArray &publicKey); + void sshKeysGenerationFinished(const QByteArray &privateKey, const QByteArray &publicKey); private: QSsh::SshKeyGenerator *m_keyGen; - const QString m_privateKeyPath; void run(); }; diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 74569c1e87d..3ecc380a304 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -195,7 +195,6 @@ HEADERS += qnxplugin.h\ FORMS += \ blackberrydeviceconfigurationwizardsetuppage.ui \ blackberryrunconfigurationwidget.ui \ - blackberrydeviceconfigurationwizardsshkeypage.ui \ blackberrydeployconfigurationwidget.ui \ blackberrydeviceconfigurationwidget.ui \ qnxbaseqtconfigwidget.ui \ diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 3c8d26f46a8..7709fd6716b 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -110,7 +110,6 @@ QtcPlugin { "blackberrydeviceconfigurationwizardpages.h", "blackberrydeviceconfigurationwizardquerypage.ui", "blackberrydeviceconfigurationwizardsetuppage.ui", - "blackberrydeviceconfigurationwizardsshkeypage.ui", "blackberrydeviceconnection.cpp", "blackberrydeviceconnection.h", "blackberrydeviceconnectionmanager.cpp",