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

[AppletQuickItem] Support launch error message

Browse Source 
Now that we can have C++ applet we can make use of setLaunchErrorMessage
to communicate a fatal error in the applet initialization.

Differential Revision: https://phabricator.kde.org/D3725
This commit is contained in:
Kai Uwe Broulik 2016-12-19 13:48:52 +01:00
parent db15022686
commit eb81b3f162
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasmaquick/appletquickitem.cpp
View File

@ -504,9 +504,11 @@ void AppletQuickItem::init()
d->qmlObject->setSource(QUrl::fromLocalFile(d->applet->kPackage().filePath("mainscript"))); d->qmlObject->setSource(QUrl::fromLocalFile(d->applet->kPackage().filePath("mainscript")));
if (!engine || !engine->rootContext() || !engine->rootContext()->isValid() || !d->qmlObject->mainComponent() || d->qmlObject->mainComponent()->isError()) { if (!engine || !engine->rootContext() || !engine->rootContext()->isValid() || !d->qmlObject->mainComponent() || d->qmlObject->mainComponent()->isError() || d->applet->failedToLaunch()) {
QString reason; QString reason;
if (d->applet->kPackage().isValid()) { if (d->applet->failedToLaunch()) {
reason = d->applet->launchErrorMessage();
} else if (d->applet->kPackage().isValid()) {
foreach (QQmlError error, d->qmlObject->mainComponent()->errors()) { foreach (QQmlError error, d->qmlObject->mainComponent()->errors()) {
reason += error.toString() + '\n'; reason += error.toString() + '\n';
} }