diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-02-02 18:30:58 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-02-02 18:31:29 +0100 |
| commit | cc278a593b829417ae210a8e21c49d1dade88b32 (patch) | |
| tree | 32c01b3a8f433ce3050a1e7704f499f00e0548cf | |
| parent | add018c762fd715e9d6608c4fd644852b8937a2d (diff) | |
| download | qt-creator-cc278a593b829417ae210a8e21c49d1dade88b32.tar.gz | |
Fix issues with maemorunconfiguration settings saving
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index 7b029adbd5..742d6922fd 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -84,13 +84,13 @@ QString targetToId(const QString &target) } // namespace -static const QLatin1String ArgumentsKey("Arguments"); -static const QLatin1String SimulatorPathKey("Simulator"); -static const QLatin1String DeviceIdKey("DeviceId"); -static const QLatin1String LastDeployedKey("LastDeployed"); +static const QLatin1String ArgumentsKey("Qt4ProjectManager.MaemoRunConfiguration.Arguments"); +static const QLatin1String SimulatorPathKey("Qt4ProjectManager.MaemoRunConfiguration.Simulator"); +static const QLatin1String DeviceIdKey("Qt4ProjectManager.MaemoRunConfiguration.DeviceId"); +static const QLatin1String LastDeployedKey("Qt4ProjectManager.MaemoRunConfiguration.LastDeployed"); static const QLatin1String DebuggingHelpersLastDeployedKey( - "DebuggingHelpersLastDeployed"); -static const QLatin1String ProFileKey("ProFile"); + "Qt4ProjectManager.MaemoRunConfiguration.DebuggingHelpersLastDeployed"); +static const QLatin1String ProFileKey("Qt4ProjectManager.MaemoRunConfiguration.ProFile"); namespace Qt4ProjectManager { namespace Internal { @@ -258,6 +258,9 @@ QVariantMap MaemoRunConfiguration::toMap() const bool MaemoRunConfiguration::fromMap(const QVariantMap &map) { + if (!RunConfiguration::fromMap(map)) + return false; + setDeviceConfig(MaemoDeviceConfigurations::instance(). find(map.value(DeviceIdKey, 0).toInt())); m_arguments = map.value(ArgumentsKey).toStringList(); @@ -271,7 +274,7 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map) const QDir &dir = QFileInfo(qt4Project()->file()->fileName()).absoluteDir(); m_proFilePath = dir.filePath(map.value(ProFileKey).toString()); - return RunConfiguration::fromMap(map); + return true; } bool MaemoRunConfiguration::currentlyNeedsDeployment() const |