From 473efb9de29dcf7d742de1f1852b6b6f12a90bae Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 27 Apr 2010 17:01:18 +0200
Subject: [PATCH] Show "default device" checkmark instead of comboboxes on
Windows
---
.../qt-s60/s60devicespreferencepane.cpp | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
index cabb8c1eae6..7d8d1656cce 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
@@ -108,13 +108,17 @@ void S60DevicesModel::appendDevice(const S60Devices::Device &device)
const Qt::ItemFlags flags = Qt::ItemIsEnabled|Qt::ItemIsSelectable;
QStandardItem *defaultItem = new QStandardItem;
- defaultItem->setCheckable(true);
- defaultItem->setCheckState(device.isDefault ? Qt::Checked : Qt::Unchecked);
- // Item is only checkable if it is not the default.
- Qt::ItemFlags checkFlags = flags;
- if (!device.isDefault && m_defaultColumnCheckable)
- checkFlags |= Qt::ItemIsUserCheckable;
- defaultItem->setFlags(checkFlags);
+ if (m_defaultColumnCheckable) {
+ defaultItem->setCheckable(true);
+ defaultItem->setCheckState(device.isDefault ? Qt::Checked : Qt::Unchecked);
+ // Item is only checkable if it is not the default.
+ Qt::ItemFlags checkFlags = flags;
+ if (!device.isDefault)
+ checkFlags |= Qt::ItemIsUserCheckable;
+ defaultItem->setFlags(checkFlags);
+ } else {
+ defaultItem->setIcon(device.isDefault ? QIcon(QLatin1String(":/extensionsystem/images/ok.png")) : QIcon());
+ }
defaultItem->setData(deviceData);
--
GitLab