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

make the toolbox directly child of containmentinterface

Browse Source
This commit is contained in:
Marco Martin 2014-05-07 20:27:51 +02:00
parent a5dc443b1b
commit 53893e8d0b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -124,13 +124,12 @@ void ContainmentInterface::init()
if (pkg.isValid()) {
QObject *containmentGraphicObject = qmlObject()->rootObject();
if (containmentGraphicObject) {
QVariantHash toolboxProperties;
toolboxProperties["parent"] = QVariant::fromValue(containmentGraphicObject);
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties);
if (toolBoxObject) {
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
}
QVariantHash toolboxProperties;
toolboxProperties["parent"] = QVariant::fromValue(this);
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties);
if (toolBoxObject && containmentGraphicObject) {
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
}
} else {
qWarning() << "Could not load toolbox package." << pkg.path();