From 9cbafa9696e7ee1ce2688e5150a5299fc0e627b1 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 1 Apr 2010 15:45:44 +0200
Subject: [PATCH] Maemo: Use first device configuration as default.
Reviewed-by: kh1
---
.../qt-maemo/maemorunconfiguration.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 2a94ae06721..b2ddb0728e6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -94,6 +94,7 @@ void MaemoRunConfiguration::init()
setDisplayName(tr("MaemoRunConfiguration"));
}
+ updateDeviceConfigurations();
connect(&MaemoDeviceConfigurations::instance(), SIGNAL(updated()), this,
SLOT(updateDeviceConfigurations()));
@@ -516,8 +517,15 @@ void MaemoRunConfiguration::qemuProcessFinished()
void MaemoRunConfiguration::updateDeviceConfigurations()
{
qDebug("%s: Current devid = %llu", Q_FUNC_INFO, m_devConfig.internalId);
- m_devConfig =
- MaemoDeviceConfigurations::instance().find(m_devConfig.internalId);
+ const MaemoDeviceConfigurations &configManager
+ = MaemoDeviceConfigurations::instance();
+ if (!m_devConfig.isValid()) {
+ const QList<MaemoDeviceConfig> &configList = configManager.devConfigs();
+ if (!configList.isEmpty())
+ m_devConfig = configList.first();
+ } else {
+ m_devConfig = configManager.find(m_devConfig.internalId);
+ }
qDebug("%s: new devid = %llu", Q_FUNC_INFO, m_devConfig.internalId);
emit deviceConfigurationsUpdated();
}
--
GitLab