From 1e5140b313fac202efe9fcf737f3d471e7c33444 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 11 Feb 2010 14:11:24 +0100
Subject: [PATCH] Maemo: Call right update function, remove redundant checks.
---
.../qt-maemo/maemorunconfiguration.cpp | 30 ++++---------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index a2acc2cca50..5734419f3f3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -380,55 +380,37 @@ QString MaemoRunConfiguration::executable() const
QString MaemoRunConfiguration::simulatorSshPort() const
{
- if (!m_cachedSimulatorInformationValid)
- updateTarget();
+ updateSimulatorInformation();
return m_simulatorSshPort;
}
QString MaemoRunConfiguration::simulatorGdbServerPort() const
{
- if (!m_cachedSimulatorInformationValid)
- updateTarget();
+ updateSimulatorInformation();;
return m_simulatorGdbServerPort;
}
QString MaemoRunConfiguration::simulatorPath() const
{
- qDebug("MaemoRunConfiguration::simulatorPath() called, %s",
- qPrintable(m_simulatorPath));
-
- if (!m_cachedSimulatorInformationValid)
- updateSimulatorInformation();
+ updateSimulatorInformation();
return m_simulatorPath;
}
QString MaemoRunConfiguration::visibleSimulatorParameter() const
{
- qDebug("MaemoRunConfiguration::visibleSimulatorParameter() called, %s",
- qPrintable(m_visibleSimulatorParameter));
-
- if (!m_cachedSimulatorInformationValid)
- updateSimulatorInformation();
+ updateSimulatorInformation();
return m_visibleSimulatorParameter;
}
QString MaemoRunConfiguration::simulator() const
{
- qDebug("MaemoRunConfiguration::simulator() called, %s",
- qPrintable(m_simulator));
-
- if (!m_cachedSimulatorInformationValid)
- updateSimulatorInformation();
+ updateSimulatorInformation();
return m_simulator;
}
QString MaemoRunConfiguration::simulatorArgs() const
{
- qDebug("MaemoRunConfiguration::simulatorArgs() called, %s",
- qPrintable(m_simulatorArgs));
-
- if (!m_cachedSimulatorInformationValid)
- updateSimulatorInformation();
+ updateSimulatorInformation();
return m_simulatorArgs;
}
--
GitLab