From aeddc56ebe35145242f8dff53d280e659789df85 Mon Sep 17 00:00:00 2001
From: David Kaspar <dkaspar@blackberry.com>
Date: Thu, 6 Mar 2014 09:20:04 +0100
Subject: [PATCH] Qnx: Set Author From Debug Token dialog improved
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
"Set Author From Debug Token" dialog list debug tokens
from Signing manager too.
Fixing BB Device Config Widget to display debug token that is not
registered in Keys option dialog yet.
Change-Id: Ib5775d08e3ce129bee0d03de6cab992a90220fd3
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
.../qnx/bardescriptoreditorauthorinformationwidget.cpp | 2 ++
src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
index 59df42e5899..de33dbf63de 100644
--- a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
@@ -34,6 +34,7 @@
#include "blackberrydebugtokenreader.h"
#include "blackberrydeviceconfiguration.h"
+#include "blackberrysigningutils.h"
#include "qnxconstants.h"
#include <projectexplorer/devicesupport/devicemanager.h>
@@ -87,6 +88,7 @@ void BarDescriptorEditorAuthorInformationWidget::setAuthorFromDebugToken()
debugTokens << bbDevice->debugToken();
}
}
+ debugTokens << BlackBerrySigningUtils::instance().debugTokens();
debugTokens.removeDuplicates();
bool ok;
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index 386276f93b9..8f36c1bc6c1 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -242,9 +242,7 @@ void BlackBerryDeviceConfigurationWidget::populateDebugTokenCombo(const QString&
{
ui->debugToken->clear();
ui->debugToken->addItems(m_utils.debugTokens());
- const int index = ui->debugToken->findText(current);
- if (index != -1)
- ui->debugToken->setCurrentIndex(index);
+ ui->debugToken->setCurrentText(current);
}
void BlackBerryDeviceConfigurationWidget::updateDebugTokenCombo()
--
GitLab