diff options
author | Juho Annunen <juho.annunen@qt.io> | 2017-10-11 13:30:52 +0300 |
---|---|---|
committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:40:45 +0000 |
commit | 3895b8504f65346a1de19aa1ceb9570175337283 (patch) | |
tree | 3c97b2b57874bc1d3932350b4db7a779ddd80840 /src/timedatesettings/timezonemodel.cpp | |
parent | 61e9e8c83e817b3692beae03bd8e683d247207b0 (diff) |
Update API and settings UI
Implemented new UI design for Settings and minor changes to API
Task-number: QTBUG-63091
Change-Id: Id72e20b53bc33ca0a3068d1e9b664fc5836a1cda
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/timedatesettings/timezonemodel.cpp')
-rw-r--r-- | src/timedatesettings/timezonemodel.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index 4273df9..58837ba 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -28,6 +28,7 @@ ****************************************************************************/ #include <QLocale> #include <QFuture> +#include <QFutureWatcher> #include <QThread> #include <QtConcurrent/QtConcurrentRun> #include "timezonemodel.h" @@ -64,7 +65,11 @@ TimezoneModel::TimezoneModel(QObject *parent) m_roleNames.insert(Name, "name"); m_roleNames.insert(Id, "id"); - QFuture<void> t1 = QtConcurrent::run(TimezoneModel::generateModel, this); + + QFutureWatcher<void> *watcher = new QFutureWatcher<void>(this); + QFuture<void> future = QtConcurrent::run(TimezoneModel::generateModel, this); + watcher->setFuture(future); + connect(watcher, SIGNAL(finished()), this, SIGNAL(ready())); } void TimezoneModel::generateModel(TimezoneModel* model) |