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

Symbian: Creator crash when info is downloaded from device

Browse Source 
and there is a change in symbian devices connected to
the PC via the USB

Change-Id: Ib57b284978ca42940254c52d5cb4e394c6fd6ceb
Reviewed-on: http://codereview.qt.nokia.com/993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
(cherry picked from commit 445959eb23)
This commit is contained in:
Pawel Polanski
2011-06-30 17:07:01 +02:00
committed by Eike Ziller
parent 568f8eb8c5
commit 31817e59dc
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
View File

@@ -481,7 +481,8 @@ void S60DeployConfigurationWidget::codaEvent(const Coda::CodaEvent &event)
switch (event.type()) { switch (event.type()) {
case Coda::CodaEvent::LocatorHello: // Commands accepted now case Coda::CodaEvent::LocatorHello: // Commands accepted now
codaIncreaseProgress(); codaIncreaseProgress();
m_codaInfoDevice->sendSymbianOsDataGetQtVersionCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getQtVersionCommandResult)); if (m_codaInfoDevice)
m_codaInfoDevice->sendSymbianOsDataGetQtVersionCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getQtVersionCommandResult));
break; break;
default: default:
break; break;
@@ -570,7 +571,8 @@ void S60DeployConfigurationWidget::getQtVersionCommandResult(const Coda::CodaCom
} }
} }
codaIncreaseProgress(); codaIncreaseProgress();
m_codaInfoDevice->sendSymbianOsDataGetRomInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getRomInfoResult)); if (m_codaInfoDevice)
m_codaInfoDevice->sendSymbianOsDataGetRomInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getRomInfoResult));
} }
void S60DeployConfigurationWidget::getRomInfoResult(const Coda::CodaCommandResult &result) void S60DeployConfigurationWidget::getRomInfoResult(const Coda::CodaCommandResult &result)
@@ -595,7 +597,8 @@ void S60DeployConfigurationWidget::getRomInfoResult(const Coda::CodaCommandResul
packagesOfInterest.append(CODA_UID); packagesOfInterest.append(CODA_UID);
packagesOfInterest.append(QTMOBILITY_UID); packagesOfInterest.append(QTMOBILITY_UID);
packagesOfInterest.append(QTCOMPONENTS_UID); packagesOfInterest.append(QTCOMPONENTS_UID);
m_codaInfoDevice->sendSymbianInstallGetPackageInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getInstalledPackagesResult), packagesOfInterest); if (m_codaInfoDevice)
m_codaInfoDevice->sendSymbianInstallGetPackageInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getInstalledPackagesResult), packagesOfInterest);
} }
void S60DeployConfigurationWidget::getInstalledPackagesResult(const Coda::CodaCommandResult &result) void S60DeployConfigurationWidget::getInstalledPackagesResult(const Coda::CodaCommandResult &result)
@@ -649,8 +652,9 @@ void S60DeployConfigurationWidget::getInstalledPackagesResult(const Coda::CodaCo
QStringList keys; QStringList keys;
keys << QLatin1String("EDisplayXPixels"); keys << QLatin1String("EDisplayXPixels");
keys << QLatin1String("EDisplayYPixels"); keys << QLatin1String("EDisplayYPixels");
//keys << "EMemoryRAMFree";
m_codaInfoDevice->sendSymbianOsDataGetHalInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getHalResult), keys); if (m_codaInfoDevice)
m_codaInfoDevice->sendSymbianOsDataGetHalInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getHalResult), keys);
} }
void S60DeployConfigurationWidget::getHalResult(const Coda::CodaCommandResult &result) void S60DeployConfigurationWidget::getHalResult(const Coda::CodaCommandResult &result)