From 295ba2bb407f56fb9b268a5ecf480c29c4d8e301 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Thu, 28 Feb 2013 17:07:26 +0100
Subject: [PATCH] DeviceKitInformation: Do not change device in kit when adding
a new device.
Change-Id: I4362e013fffd267f795780ef2816756dc059fe19
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/projectexplorer/kitinformationconfigwidget.cpp | 4 ++++
src/plugins/projectexplorer/kitinformationconfigwidget.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
index 9945c31b188..5ee3f6483b9 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
@@ -346,15 +346,19 @@ void DeviceInformationConfigWidget::manageDevices()
void DeviceInformationConfigWidget::modelAboutToReset()
{
m_selectedId = m_model->deviceId(m_comboBox->currentIndex());
+ m_ignoreChange = true;
}
void DeviceInformationConfigWidget::modelReset()
{
m_comboBox->setCurrentIndex(m_model->indexForId(m_selectedId));
+ m_ignoreChange = false;
}
void DeviceInformationConfigWidget::currentDeviceChanged()
{
+ if (m_ignoreChange)
+ return;
DeviceKitInformation::setDeviceId(m_kit, m_model->deviceId(m_comboBox->currentIndex()));
}
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h
index 0b8ea8696a6..3838c3aede9 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.h
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h
@@ -159,6 +159,7 @@ private slots:
private:
bool m_isReadOnly;
+ bool m_ignoreChange;
QComboBox *m_comboBox;
QPushButton *m_manageButton;
DeviceManagerModel *m_model;
--
GitLab