diff options
author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-10 09:46:40 +0200 |
---|---|---|
committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-16 13:43:57 +0000 |
commit | 7c9fe368de133a6b4e256392e0db0d6c3dc1cf9a (patch) | |
tree | e2462fe843cb8ed41c1261fed07cb8713a5d48e1 /src/imports/timedatesettings | |
parent | c6b5855b446c73f8a60cc3d4427fc445e0ba400d (diff) |
Use qmlRegisterSingletonType instead of setContextProperty in plugins
Change-Id: Ib6c6c7bc5e5e1db005dd43222163fceb50c8894a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/imports/timedatesettings')
-rw-r--r-- | src/imports/timedatesettings/plugin.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/imports/timedatesettings/plugin.cpp b/src/imports/timedatesettings/plugin.cpp index e55cddc..0f67699 100644 --- a/src/imports/timedatesettings/plugin.cpp +++ b/src/imports/timedatesettings/plugin.cpp @@ -33,7 +33,6 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - #include <QtQml/QQmlExtensionPlugin> #include <QtQml/qqml.h> #include <qcoreapplication.h> @@ -41,8 +40,7 @@ #include <QQmlContext> #include <systemtime.h> -#include <timezonemodel.h> -#include <timezonefiltermodel.h> +#include "timezonefiltermodel.h" template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { @@ -60,17 +58,7 @@ public: void registerTypes(const char *uri) { qmlRegisterSingletonType<SystemTime>(uri, 1, 0, "TimeManager", &instance<SystemTime>); - } - - void initializeEngine(QQmlEngine * engine, const char * uri) - { - Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.timedate")); - TimezoneModel* timezoneModel = new TimezoneModel(engine); - TimezoneFilterModel* filter = new TimezoneFilterModel(engine); - filter->setSourceModel(timezoneModel); - - engine->rootContext()->setContextProperty("Timezones", timezoneModel); - engine->rootContext()->setContextProperty("TimezonesFilter", filter); + qmlRegisterSingletonType<TimezoneFilterModel>(uri, 1, 0, "TimezonesFilter", &instance<TimezoneFilterModel>); } }; |