From 8ae0ad944228de1dab921dd5040156cd35f4ab5f Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 10 Feb 2011 16:07:56 +0100 Subject: [PATCH] Maemo: Fix free ports calculation. This was always zero before the first deployment. --- src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp index 9b67b449f7..af4a34ac68 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp @@ -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 -- 2.11.0