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

[configview] Simplify code / workaround Qt5.15 crash

Browse Source 
Summary:
QQmlComponent::beginCreate and completeCreate are useful if you need to
set properties on the object explicitly. We're not doing that here, we
can just call create.

Test Plan:
On Qt5.15
Right click a panel
choose edit

Reviewers: #plasma, apol

Reviewed By: apol

Subscribers: apol, kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D28599
This commit is contained in:
David Edmundson 2020-04-06 12:21:45 +01:00
parent 6e39c1de5b
commit 0417bf61d5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plasmaquick/configview.cpp
View File

@ -134,9 +134,13 @@ void ConfigViewPrivate::init()
q->setResizeMode(QQuickView::SizeViewToRootObject); q->setResizeMode(QQuickView::SizeViewToRootObject);
auto plasmoid = applet.data()->property("_plasma_graphicObject").value<QObject *>();
q->engine()->rootContext()->setContextProperties({QQmlContext::PropertyPair{QStringLiteral("plasmoid"), QVariant::fromValue(plasmoid)},
QQmlContext::PropertyPair{QStringLiteral("configDialog"), QVariant::fromValue(q)}});
//config model local of the applet //config model local of the applet
QQmlComponent *component = new QQmlComponent(q->engine(), applet.data()->kPackage().fileUrl("configmodel"), q); QQmlComponent *component = new QQmlComponent(q->engine(), applet.data()->kPackage().fileUrl("configmodel"), q);
QObject *object = component->beginCreate(q->engine()->rootContext()); QObject *object = component->create(q->engine()->rootContext());
configModel = qobject_cast<ConfigModel *>(object); configModel = qobject_cast<ConfigModel *>(object);
if (configModel) { if (configModel) {
@ -172,9 +176,6 @@ void ConfigViewPrivate::init()
} }
} }
q->engine()->rootContext()->setContextProperty(QStringLiteral("plasmoid"), applet.data()->property("_plasma_graphicObject").value<QObject *>());
q->engine()->rootContext()->setContextProperty(QStringLiteral("configDialog"), q);
component->completeCreate();
delete component; delete component;
} }