Qnx: Set Author From Debug Token dialog improved

"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>

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;

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()