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/localesettings | |
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/localesettings')
-rw-r--r-- | src/imports/localesettings/plugin.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp index 7edd2c5..1c2bcca 100644 --- a/src/imports/localesettings/plugin.cpp +++ b/src/imports/localesettings/plugin.cpp @@ -41,8 +41,7 @@ #include <QQmlContext> #include <systemlocale.h> -#include <localemodel.h> -#include <localefiltermodel.h> +#include "localefiltermodel.h" template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { @@ -59,16 +58,8 @@ class LanguageSettingsQmlPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) { - qmlRegisterSingletonType<SystemLocale>(uri, 1, 0, "LocaleManager", &instance<SystemLocale>); - } - - void initializeEngine(QQmlEngine * engine, const char * uri) - { - Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.locale")); - LocaleModel*localeModel = new LocaleModel(engine); - LocaleFilterModel* filter = new LocaleFilterModel(engine); - filter->setSourceModel(localeModel); - engine->rootContext()->setContextProperty("LocaleFilter", filter); + qmlRegisterSingletonType<SystemLocale>(uri, 1, 0, "LocaleManager", &instance<SystemLocale>); + qmlRegisterSingletonType<LocaleFilterModel>(uri, 1, 0, "LocaleFilter", &instance<LocaleFilterModel>); } }; |