From c6b5855b446c73f8a60cc3d4427fc445e0ba400d Mon Sep 17 00:00:00 2001
From: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Date: Tue, 23 Feb 2016 09:13:21 +0200
Subject: Migrate settings UI to use Qt Quick Controls 2

Task-number: QTEE-1057
Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 src/timedatesettings/timezonemodel.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/timedatesettings/timezonemodel.cpp')

diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp
index 2a8d0ed..cca90eb 100644
--- a/src/timedatesettings/timezonemodel.cpp
+++ b/src/timedatesettings/timezonemodel.cpp
@@ -46,7 +46,7 @@ TimezoneItem::TimezoneItem(const QByteArray& id, QObject *parent)
     QTimeZone tz = QTimeZone(id);
     m_name = tz.displayName(QTimeZone::StandardTime);
     m_country = QLocale::countryToString(tz.country());
-    m_id = id;
+    m_id = QString::fromUtf8(id);
 }
 
 QString TimezoneItem::name() const
@@ -116,11 +116,11 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const
     if (!index.isValid()) return QVariant();
 
     TimezoneItem *item = m_items[index.row()];
-    if (role == Qt::UserRole) {
-        return item->id();
-    }
 
     switch (role) {
+    case Qt::UserRole:
+        return QVariant::fromValue(static_cast<QObject*>(item));
+        break;
     case Name:
         return item->id();
         break;
@@ -134,6 +134,6 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const
         return item->id();
         break;
     default:
-        return "";
+        return QVariant();
     }
 }
-- 
cgit v1.2.3