From ab8647cc1e64ff2428cfe0a319c6090f93d0b145 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 29 Jul 2010 10:30:54 +0200
Subject: [PATCH] Maemo: Fix device config model's data() member function.
This subtle bug would lead to weird behavior of QComboBox on Windows.
Reviewed-by: kh1
---
.../qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
index a0e00b23436..69e6142cb68 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
@@ -125,7 +125,7 @@ QVariant MaemoDeviceConfigListModel::data(const QModelIndex &index, int role) co
{
if (!index.isValid() || index.row() >= rowCount()
|| role != Qt::DisplayRole)
- return QString();
+ return QVariant();
return MaemoDeviceConfigurations::instance().devConfigs().at(index.row()).name;
}
--
GitLab