Migrate settings UI to use Qt Quick Controls 2

Task-number: QTEE-1057
Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

4 files changed, 9 insertions, 7 deletions

diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h
index 5ee6eef..5722259 100644
--- a/src/timedatesettings/systemtime_p.h
+++ b/src/timedatesettings/systemtime_p.h
@@ -66,7 +66,7 @@ public:
     QString timeZone() const {
         if (m_timeInterface)
             return m_timeInterface->timezone();
-        return "";
+        return QString();
     }
 
     void setTimeZone(const QString& aTimeZone) {
diff --git a/src/timedatesettings/timezonefiltermodel.cpp b/src/timedatesettings/timezonefiltermodel.cpp
index 3d1c0a4..69ed0c7 100644
--- a/src/timedatesettings/timezonefiltermodel.cpp
+++ b/src/timedatesettings/timezonefiltermodel.cpp
@@ -99,6 +99,6 @@ QVariant TimezoneFilterModel::itemFromRow(const int row) const
             return nameRole;
         }
     }
-    return QVariant::fromValue(QString(""));
+    return QVariant();
 }
 
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();
     }
 }
diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h
index 7404954..a57be04 100644
--- a/src/timedatesettings/timezonemodel.h
+++ b/src/timedatesettings/timezonemodel.h
@@ -45,6 +45,8 @@ class TimezoneItem : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString id READ id CONSTANT)
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString country READ country CONSTANT)
 public:
     explicit TimezoneItem(const QByteArray& id, QObject *parent=0);
     QString name() const;