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

Fixed USB detach related bug on Symbian

Browse Source 
Task-Number: QTCREATORBUG-3100
Reviewed-by: Tobias Hunger
This commit is contained in:
Pawel Polanski
2010-11-22 10:47:39 +01:00
parent 4b8afa8aef
commit fcdd588bb6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -468,7 +468,6 @@ RunConfiguration *S60DeviceRunConfigurationFactory::clone(Target *parent, RunCon
S60DeviceRunControl::S60DeviceRunControl(RunConfiguration *runConfiguration, QString mode) : S60DeviceRunControl::S60DeviceRunControl(RunConfiguration *runConfiguration, QString mode) :
RunControl(runConfiguration, mode), RunControl(runConfiguration, mode),
m_toolChain(ProjectExplorer::ToolChain_INVALID), m_toolChain(ProjectExplorer::ToolChain_INVALID),
m_handleDeviceRemoval(true),
m_launcher(0) m_launcher(0)
{ {
// connect for automatically reporting the "finished deploy" state to the progress manager // connect for automatically reporting the "finished deploy" state to the progress manager
@@ -606,7 +605,6 @@ void S60DeviceRunControl::printConnectFailed(const QString &errorMessage)
void S60DeviceRunControl::launcherFinished() void S60DeviceRunControl::launcherFinished()
{ {
m_handleDeviceRemoval = false;
trk::Launcher::releaseToDeviceManager(m_launcher); trk::Launcher::releaseToDeviceManager(m_launcher);
m_launcher->deleteLater(); m_launcher->deleteLater();
m_launcher = 0; m_launcher = 0;
@@ -672,7 +670,10 @@ void S60DeviceRunControl::printApplicationOutput(const QString &output, bool onS
void S60DeviceRunControl::deviceRemoved(const SymbianUtils::SymbianDevice &d) void S60DeviceRunControl::deviceRemoved(const SymbianUtils::SymbianDevice &d)
{ {
if (m_handleDeviceRemoval && d.portName() == m_serialPortName) { if (m_launcher && d.portName() == m_serialPortName) {
trk::Launcher::releaseToDeviceManager(m_launcher);
m_launcher->deleteLater();
m_launcher = 0;
appendMessage(this, tr("The device '%1' has been disconnected").arg(d.friendlyName()), true); appendMessage(this, tr("The device '%1' has been disconnected").arg(d.friendlyName()), true);
emit finished(); emit finished();
} }

1
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -188,7 +188,6 @@ private:
QString m_executableFileName; QString m_executableFileName;
QString m_qtDir; QString m_qtDir;
QString m_qtBinPath; QString m_qtBinPath;
bool m_handleDeviceRemoval;
trk::Launcher *m_launcher; trk::Launcher *m_launcher;
char m_installationDrive; char m_installationDrive;
}; };