Differential D4362 Diff 10755 src/plasmaquick/appletquickitem.cpp

Changeset View

Standalone View

View Options

src/plasmaquick/appletquickitem.cpp

Context not available.
41{ 41​{
42 42​
43QHash<QObject *, AppletQuickItem *> AppletQuickItemPrivate::s_rootObjects = QHash<QObject *, AppletQuickItem *>(); 43​QHash<QObject *, AppletQuickItem *> AppletQuickItemPrivate::s_rootObjects = QHash<QObject *, AppletQuickItem *>();
44​QHash<QQmlEngine *, QQmlComponent *> AppletQuickItemPrivate::s_qqc1PlasmaStyleComponents;
44 45​
45 46​
46AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem *item) 47​AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem *item)
Context not available.
490 //Force QtQuickControls to use the "Plasma" style for this engine. 491​ //Force QtQuickControls to use the "Plasma" style for this engine.
491 //this way is possible to mix QtQuickControls and plasma components in applets 492​ //this way is possible to mix QtQuickControls and plasma components in applets
492 //while still having the desktop style in configuration dialogs 493​ //while still having the desktop style in configuration dialogs
493 QQmlComponent c(engine); 494​ QQmlComponent *c = AppletQuickItemPrivate::s_qqc1PlasmaStyleComponents.value(engine);
494 c.setData(QByteArrayLiteral("import QtQuick 2.1\n\ 495​ if (!c) {
495 import QtQuick.Controls 1.0\n\ 496​ c = new QQmlComponent(engine);
davidedmundsonUnsubmitted
Not Done

if you were to do this:
just do c = new QQmlComponent(qApp);

and you have the cleanup done for you.

davidedmundson: if you were to do this: just do c = new QQmlComponent(qApp); and you have the cleanup done for…
496 import QtQuick.Controls.Private 1.0\n \ 497​ // FIXME never executed, even if I kquitapp plasmashell
497 Item {\ 498​ connect(engine, &QObject::destroyed, [engine] {
498 Component.onCompleted: {\ 499​ AppletQuickItemPrivate::s_qqc1PlasmaStyleComponents.remove(engine);
499 Settings.styleName = \"Plasma\";\ 500​ });
500 }\ 501​
501 }"), QUrl()); 502​ c->setData(QByteArrayLiteral("import QtQml 2.1\n\
502 QObject *o = c.create(); 503​ import QtQuick.Controls 1.0\n\
504​ import QtQuick.Controls.Private 1.0\n \
505​ QtObject {\n \
506​ Component.onCompleted: Settings.styleName = 'Plasma' \n \
507​ }"), QUrl());
508​
509​ AppletQuickItemPrivate::s_qqc1PlasmaStyleComponents.insert(engine, c);
510​ }
511​
512​ QObject *o = c->create();
503 o->deleteLater(); 513​ o->deleteLater();
504 514​
505 d->qmlObject->setSource(QUrl::fromLocalFile(d->applet->kPackage().filePath("mainscript"))); 515​ d->qmlObject->setSource(QUrl::fromLocalFile(d->applet->kPackage().filePath("mainscript")));
Context not available.