Commit 8ae0ad94 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix free ports calculation.

This was always zero before the first deployment.
parent 96fde308
......@@ -993,15 +993,17 @@ void MaemoDeployStep::handleDeviceInstallerErrorOutput(const QByteArray &output)
MaemoPortList MaemoDeployStep::freePorts() const
{
const Qt4BuildConfiguration * const qt4bc = qt4BuildConfiguration();
if (!m_cachedDeviceConfig)
const MaemoDeviceConfig::ConstPtr &devConf
= m_cachedDeviceConfig ? m_cachedDeviceConfig : m_deviceConfig;
if (!devConf)
return MaemoPortList();
if (m_cachedDeviceConfig->type() == MaemoDeviceConfig::Simulator && qt4bc) {
if (devConf->type() == MaemoDeviceConfig::Simulator && qt4bc) {
MaemoQemuRuntime rt;
const int id = qt4bc->qtVersion()->uniqueId();
if (MaemoQemuManager::instance().runtimeForQtVersion(id, &rt))
return rt.m_freePorts;
}
return m_cachedDeviceConfig->freePorts();
return devConf->freePorts();
}
const Qt4BuildConfiguration *MaemoDeployStep::qt4BuildConfiguration() const
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment