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

use KDeclarative to determine the platform paths

Browse Source
This commit is contained in:
Aaron Seigo 2012-10-30 21:30:01 +01:00
parent 104634b9cd
commit f024af5de1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
private/packages.cpp
View File

@ -30,6 +30,7 @@
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include "kdeclarative.h"
#include "private/wallpaper_p.h"
#include "package.h"
#include "config-plasma.h"
@ -72,6 +73,7 @@ void ChangeableMainScriptPackage::pathChanged(Package *package)
QString PlasmoidPackage::findMainScript(Package *package)
{
<<<<<<< HEAD
const QString mainScript = package->path() + "/ui/main.qml";
if (QFile::exists(mainScript)) {
return mainScript;
@ -89,6 +91,12 @@ void PlasmoidPackage::initPackage(Package *package)
if (!prefixPaths.isEmpty()) {
package->setContentsPrefixPaths(prefixPaths);
}
=======
QStringList platform = KDeclarative::runtimePlatform();
if (!platform.isEmpty()) {
platform.append("contents");
setContentsPrefixPaths(platform);
>>>>>>> use KDeclarative to determine the platform paths
}
package->setServicePrefix("plasma-applet-");