Maemo: Make device configuration id type consistent.

Task-number: QTCREATORBUG-1460

3 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
index 7ff2747ddf..7d800e2e5c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
@@ -116,7 +116,7 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
     : name(settings.value(NameKey).toString()),
       type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())),
       gdbServerPort(settings.value(GdbServerPortKey, defaultGdbServerPort(type)).toInt()),
-      internalId(settings.value(InternalIdKey, nextId).toInt())
+      internalId(settings.value(InternalIdKey, nextId).toULongLong())
 {
     if (internalId == nextId)
         ++nextId;
@@ -227,7 +227,7 @@ MaemoDeviceConfig MaemoDeviceConfigurations::find(const QString &name) const
     return resultIt == m_devConfigs.constEnd() ? MaemoDeviceConfig() : *resultIt;
 }
 
-MaemoDeviceConfig MaemoDeviceConfigurations::find(int id) const
+MaemoDeviceConfig MaemoDeviceConfigurations::find(quint64 id) const
 {
     QList<MaemoDeviceConfig>::ConstIterator resultIt =
         std::find_if(m_devConfigs.constBegin(), m_devConfigs.constEnd(),
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
index 7ffa28251e..0c07d3eb95 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h
@@ -97,7 +97,7 @@ public:
     QList<MaemoDeviceConfig> devConfigs() const { return m_devConfigs; }
     void setDevConfigs(const QList<MaemoDeviceConfig> &devConfigs);
     MaemoDeviceConfig find(const QString &name) const;
-    MaemoDeviceConfig find(int id) const;
+    MaemoDeviceConfig find(quint64 id) const;
 
 signals:
     void updated();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index db90c406dd..579bf4e491 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -155,7 +155,7 @@ bool MaemoRunConfiguration::fromMap(const QVariantMap &map)
         return false;
 
     setDeviceConfig(MaemoDeviceConfigurations::instance().
-        find(map.value(DeviceIdKey, 0).toInt()));
+        find(map.value(DeviceIdKey, 0).toULongLong()));
     m_arguments = map.value(ArgumentsKey).toStringList();
     getDeployTimesFromMap(map);
     const QDir dir = QDir(target()->project()->projectDirectory());