summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
commit9f831dde07cb2411808534e76669b28a1b76e21d (patch)
treeed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
parentcdac81f896ef4b052d76f96485a08e6ec13696b8 (diff)
parentea1a92484ac99057b06130a012164bf9788650e9 (diff)
downloadqt-creator-wip/clang.tar.gz
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp')
-rw-r--r--src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
index 37d8a199e2..8585cec354 100644
--- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
@@ -143,9 +143,24 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken()
BlackBerryConfigurationManager &configuration = BlackBerryConfigurationManager::instance();
+ bool ok;
+ const QString cskPassword = m_utils.cskPassword(this, &ok);
+
+ if (!ok) {
+ setBusy(false);
+ return;
+ }
+
+ const QString certificatePassword = m_utils.certificatePassword(this, &ok);
+
+ if (!ok) {
+ setBusy(false);
+ return;
+ }
+
m_requester->requestDebugToken(m_ui->debugTokenPath->path(),
- m_utils.cskPassword(), configuration.defaultKeystorePath(),
- m_utils.certificatePassword(), m_ui->devicePin->text());
+ cskPassword, configuration.defaultKeystorePath(),
+ certificatePassword, m_ui->devicePin->text());
}
void BlackBerryDebugTokenRequestDialog::setDefaultPath()
@@ -235,6 +250,11 @@ void BlackBerryDebugTokenRequestDialog::debugTokenArrived(int status)
break;
}
+ QFile file(m_ui->debugTokenPath->path());
+
+ if (file.exists())
+ file.remove();
+
QMessageBox::critical(this, tr("Error"), errorString);
setBusy(false);