alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't register ConfigModel twice

Browse Source 
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
This commit is contained in:
David Edmundson 2017-01-08 20:22:29 +00:00
parent a0119858e4
commit dcd81c6be8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasmaquick/configview.cpp
View File

@ -101,8 +101,6 @@ void ConfigViewPrivate::init()
kdeclarative.setTranslationDomain("plasma_applet_" + applet.data()->pluginMetaData().pluginId()); kdeclarative.setTranslationDomain("plasma_applet_" + applet.data()->pluginMetaData().pluginId());
} }
kdeclarative.setupBindings(); kdeclarative.setupBindings();
qmlRegisterType<ConfigModel>("org.kde.plasma.configuration", 2, 0, "ConfigModel");
qmlRegisterType<ConfigCategory>("org.kde.plasma.configuration", 2, 0, "ConfigCategory");
//FIXME: problem on nvidia, all windows should be transparent or won't show //FIXME: problem on nvidia, all windows should be transparent or won't show
q->setColor(Qt::transparent); q->setColor(Qt::transparent);
@ -266,9 +264,9 @@ ConfigView::ConfigView(Plasma::Applet *applet, QWindow *parent)
d(new ConfigViewPrivate(applet, this)) d(new ConfigViewPrivate(applet, this))
{ {
setIcon(QIcon::fromTheme(QStringLiteral("configure"))); setIcon(QIcon::fromTheme(QStringLiteral("configure")));
d->init();
qmlRegisterType<ConfigModel>("org.kde.plasma.configuration", 2, 0, "ConfigModel"); qmlRegisterType<ConfigModel>("org.kde.plasma.configuration", 2, 0, "ConfigModel");
qmlRegisterType<ConfigCategory>("org.kde.plasma.configuration", 2, 0, "ConfigCategory"); qmlRegisterType<ConfigCategory>("org.kde.plasma.configuration", 2, 0, "ConfigCategory");
d->init();
connect(applet, &QObject::destroyed, this, &ConfigView::close); connect(applet, &QObject::destroyed, this, &ConfigView::close);
connect(this, &QQuickView::statusChanged, [=](QQuickView::Status status) { connect(this, &QQuickView::statusChanged, [=](QQuickView::Status status) {
if (status == QQuickView::Ready) { if (status == QQuickView::Ready) {