summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
index 7c707ecedf..6429567b1d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp
@@ -394,23 +394,12 @@ void AbstractMaemoDeployStep::handleRemoteStderr(const QString &output)
}
}
-MaemoPortList AbstractMaemoDeployStep::freePorts() const
-{
- return freePorts(m_deviceConfig);
-}
-
MaemoPortList AbstractMaemoDeployStep::freePorts(const MaemoDeviceConfig::ConstPtr &devConf) const
{
const Qt4BuildConfiguration * const qt4bc = qt4BuildConfiguration();
- if (!devConf)
+ if (!qt4bc)
return MaemoPortList();
- if (devConf->type() == MaemoDeviceConfig::Emulator && qt4bc) {
- MaemoQemuRuntime rt;
- const int id = qt4bc->qtVersion()->uniqueId();
- if (MaemoQemuManager::instance().runtimeForQtVersion(id, &rt))
- return rt.m_freePorts;
- }
- return devConf->freePorts();
+ return MaemoGlobal::freePorts(devConf, qt4bc->qtVersion());
}
const Qt4BuildConfiguration *AbstractMaemoDeployStep::qt4BuildConfiguration() const