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

Fix issues with maemorunconfiguration settings saving

Browse Source
This commit is contained in:
Tobias Hunger
2010-02-02 18:30:58 +01:00
parent add018c762
commit cc278a593b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -84,13 +84,13 @@ QString targetToId(const QString &target)
} // namespace } // namespace
static const QLatin1String ArgumentsKey("Arguments"); static const QLatin1String ArgumentsKey("Qt4ProjectManager.MaemoRunConfiguration.Arguments");
static const QLatin1String SimulatorPathKey("Simulator"); static const QLatin1String SimulatorPathKey("Qt4ProjectManager.MaemoRunConfiguration.Simulator");
static const QLatin1String DeviceIdKey("DeviceId"); static const QLatin1String DeviceIdKey("Qt4ProjectManager.MaemoRunConfiguration.DeviceId");
static const QLatin1String LastDeployedKey("LastDeployed"); static const QLatin1String LastDeployedKey("Qt4ProjectManager.MaemoRunConfiguration.LastDeployed");
static const QLatin1String DebuggingHelpersLastDeployedKey( static const QLatin1String DebuggingHelpersLastDeployedKey(
"DebuggingHelpersLastDeployed"); "Qt4ProjectManager.MaemoRunConfiguration.DebuggingHelpersLastDeployed");
static const QLatin1String ProFileKey("ProFile"); static const QLatin1String ProFileKey("Qt4ProjectManager.MaemoRunConfiguration.ProFile");
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {
@@ -258,6 +258,9 @@ QVariantMap MaemoRunConfiguration::toMap() const
bool MaemoRunConfiguration::fromMap(const QVariantMap &map) bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
{ {
if (!RunConfiguration::fromMap(map))
return false;
setDeviceConfig(MaemoDeviceConfigurations::instance(). setDeviceConfig(MaemoDeviceConfigurations::instance().
find(map.value(DeviceIdKey, 0).toInt())); find(map.value(DeviceIdKey, 0).toInt()));
m_arguments = map.value(ArgumentsKey).toStringList(); m_arguments = map.value(ArgumentsKey).toStringList();
@@ -271,7 +274,7 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
const QDir &dir = QFileInfo(qt4Project()->file()->fileName()).absoluteDir(); const QDir &dir = QFileInfo(qt4Project()->file()->fileName()).absoluteDir();
m_proFilePath = dir.filePath(map.value(ProFileKey).toString()); m_proFilePath = dir.filePath(map.value(ProFileKey).toString());
return RunConfiguration::fromMap(map); return true;
} }
bool MaemoRunConfiguration::currentlyNeedsDeployment() const bool MaemoRunConfiguration::currentlyNeedsDeployment() const