diff options
| author | Mehdi Fekari <mfekari@rim.com> | 2013-07-04 16:21:33 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2013-07-24 18:20:23 +0200 |
| commit | 7b313e9696e789e8b20c2ef53cc12c2da522a2d5 (patch) | |
| tree | f5957b204dbb7c93e09e2a2c8c9c88a17ce0e3a7 /src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp | |
| parent | 2ac65aaa7ca509fbfd82a32f0ee5367ca63738e1 (diff) | |
| download | qt-creator-7b313e9696e789e8b20c2ef53cc12c2da522a2d5.tar.gz | |
Qnx: Refactor BlackBerryConfiguration
Improve the NDK setting page to enable managing multiple NDKs.
* Refactor BlackBerryConfiguration to support multiple configurations
* Add auto detected kits for installed NDKs
* Add/Remove manual NDKs
Change-Id: Icbc850551da3f729ccaa3473da720ade3051adaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Diffstat (limited to 'src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp')
| -rw-r--r-- | src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp index 8728f11c07..df7426f901 100644 --- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp +++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp @@ -32,7 +32,7 @@ #include "blackberrydebugtokenrequestdialog.h" #include "blackberrydebugtokenrequester.h" #include "blackberrydeviceinformation.h" -#include "blackberryconfiguration.h" +#include "blackberryconfigurationmanager.h" #include "blackberrycertificate.h" #include "ui_blackberrydebugtokenrequestdialog.h" @@ -283,9 +283,9 @@ void BlackBerryDebugTokenRequestDialog::setBusy(bool busy) void BlackBerryDebugTokenRequestDialog::populateComboBox() { - BlackBerryConfiguration &configuration = BlackBerryConfiguration::instance(); + BlackBerryConfigurationManager &configManager = BlackBerryConfigurationManager::instance(); - QList<BlackBerryCertificate*> certificates = configuration.certificates(); + QList<BlackBerryCertificate*> certificates = configManager.certificates(); foreach (const BlackBerryCertificate *certificate, certificates) m_ui->keystore->addItem(certificate->fileName()); |