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

SVN_SILENT removed

Browse Source
This commit is contained in:
Christoph Feck 2012-10-30 21:34:41 +01:00 committed by Aaron Seigo
parent f024af5de1
commit 03a88c40c0
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
private/packages.cpp
View File

@ -73,7 +73,6 @@ void ChangeableMainScriptPackage::pathChanged(Package *package)
QString PlasmoidPackage::findMainScript(Package *package) QString PlasmoidPackage::findMainScript(Package *package)
{ {
<<<<<<< HEAD
const QString mainScript = package->path() + "/ui/main.qml"; const QString mainScript = package->path() + "/ui/main.qml";
if (QFile::exists(mainScript)) { if (QFile::exists(mainScript)) {
return mainScript; return mainScript;
@ -84,19 +83,10 @@ QString PlasmoidPackage::findMainScript(Package *package)
void PlasmoidPackage::initPackage(Package *package) void PlasmoidPackage::initPackage(Package *package)
{ {
ChangeableMainScriptPackage::initPackage(package);
QString pathsString(getenv("PLASMA_CUSTOM_PREFIX_PATHS"));
if (!pathsString.isEmpty()) {
QStringList prefixPaths(pathsString.split(":"));
if (!prefixPaths.isEmpty()) {
package->setContentsPrefixPaths(prefixPaths);
}
=======
QStringList platform = KDeclarative::runtimePlatform(); QStringList platform = KDeclarative::runtimePlatform();
if (!platform.isEmpty()) { if (!platform.isEmpty()) {
platform.append("contents"); platform.append("contents");
setContentsPrefixPaths(platform); setContentsPrefixPaths(platform);
>>>>>>> use KDeclarative to determine the platform paths
} }
package->setServicePrefix("plasma-applet-"); package->setServicePrefix("plasma-applet-");