feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qnx: Fix lifecycle of the BlackBerryConfigurationManager

Browse Source 
This fixes a crash when this class tries to show a UI while it is
destructed.

Task-number: QTCREATORBUG-11712
Change-Id: If4aca14a3ca4792bec1a45903a1f38287d16dbc4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-03-19 12:04:04 +01:00
parent bfd6040224
commit 0e67b293b7
20 changed files with 94 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/blackberrypotentialkit.cpp
View File

@@ -66,7 +66,7 @@ bool BlackBerryPotentialKit::isEnabled() const
bool BlackBerryPotentialKit::shouldShow()
{
QList<BlackBerryApiLevelConfiguration *> configs =
BlackBerryConfigurationManager::instance().apiLevels();
BlackBerryConfigurationManager::instance()->apiLevels();
if (configs.isEmpty())
return false; // do not display when we do not have any BlackBerry API Level registered
foreach (BlackBerryApiLevelConfiguration *config, configs) {
@@ -104,7 +104,7 @@ BlackBerryPotentialKitWidget::BlackBerryPotentialKitWidget(QWidget *parent)
layout->addWidget(openOptions, 1, 1);
connect(openOptions, SIGNAL(clicked()), this, SLOT(openOptions()));
connect(&BlackBerryConfigurationManager::instance(), SIGNAL(settingsChanged()),
connect(BlackBerryConfigurationManager::instance(), SIGNAL(settingsChanged()),
this, SLOT(recheck()));
}