From dcd81c6be85f02b78220a4e1bb084a776f384f85 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sun, 8 Jan 2017 20:22:29 +0000 Subject: [PATCH] Don't register ConfigModel twice Test Plan: Opened config Reviewers: #plasma, broulik Reviewed By: #plasma, broulik Subscribers: plasma-devel, #frameworks Tags: #plasma, #frameworks Differential Revision: https://phabricator.kde.org/D4010 --- src/plasmaquick/configview.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp index e8627c93d..97d194397 100644 --- a/src/plasmaquick/configview.cpp +++ b/src/plasmaquick/configview.cpp @@ -101,8 +101,6 @@ void ConfigViewPrivate::init() kdeclarative.setTranslationDomain("plasma_applet_" + applet.data()->pluginMetaData().pluginId()); } kdeclarative.setupBindings(); - qmlRegisterType("org.kde.plasma.configuration", 2, 0, "ConfigModel"); - qmlRegisterType("org.kde.plasma.configuration", 2, 0, "ConfigCategory"); //FIXME: problem on nvidia, all windows should be transparent or won't show q->setColor(Qt::transparent); @@ -266,9 +264,9 @@ ConfigView::ConfigView(Plasma::Applet *applet, QWindow *parent) d(new ConfigViewPrivate(applet, this)) { setIcon(QIcon::fromTheme(QStringLiteral("configure"))); - d->init(); qmlRegisterType("org.kde.plasma.configuration", 2, 0, "ConfigModel"); qmlRegisterType("org.kde.plasma.configuration", 2, 0, "ConfigCategory"); + d->init(); connect(applet, &QObject::destroyed, this, &ConfigView::close); connect(this, &QQuickView::statusChanged, [=](QQuickView::Status status) { if (status == QQuickView::Ready) {