diff --git a/src/plasma/private/applet_p.cpp b/src/plasma/private/applet_p.cpp index 9d210c5e6..624e4fe46 100644 --- a/src/plasma/private/applet_p.cpp +++ b/src/plasma/private/applet_p.cpp @@ -29,9 +29,7 @@ #include #include #include -#include #include -#include #include #include @@ -115,9 +113,8 @@ AppletPrivate::~AppletPrivate() delete modificationsTimer; } -void AppletPrivate::init(const QString &_packagePath, const QVariantList &args) +void AppletPrivate::init(const QString &packagePath, const QVariantList &args) { - const QString packagePath = _packagePath.isEmpty() ? QFileInfo(appletDescription.metaDataFileName()).dir().path() : _packagePath; // WARNING: do not access config() OR globalConfig() in this method! // that requires a Corona, which is not available at this point q->setHasConfigurationInterface(true); diff --git a/src/plasmaquick/configmodel.cpp b/src/plasmaquick/configmodel.cpp index 03beac7b8..975854ad3 100644 --- a/src/plasmaquick/configmodel.cpp +++ b/src/plasmaquick/configmodel.cpp @@ -199,9 +199,7 @@ QVariant ConfigModel::data(const QModelIndex &index, int role) const const QString source = d->categories.at(index.row())->source(); // Quick check if source is an absolute path or not if (d->appletInterface && !source.isEmpty() && !(source.startsWith('/') && source.endsWith(QLatin1String("qml")))) { - if(!d->appletInterface.data()->kPackage().isValid()) - qWarning() << "wrong applet" << d->appletInterface.data()->pluginMetaData().name(); - return QUrl::fromLocalFile(d->appletInterface.data()->kPackage().filePath("ui", source)); + return QUrl::fromLocalFile(d->appletInterface.data()->package().filePath("ui", source)); } else { return source; }