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

some compilation fixes, but plasma/package.cpp is still a big mess

Browse Source
This commit is contained in:
David Faure 2012-06-18 13:52:02 +02:00
parent 21a5833090
commit 8f02ed76a1
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package.cpp
View File

@ -864,17 +864,8 @@ bool PackagePrivate::installPackage(const QString &package, const QString &packa
const QString serviceName = servicePrefix + meta.pluginName() + ".desktop";
<<<<<<< HEAD
QString service = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kde5/services/") + serviceName;
#ifndef PLASMA_NO_KIO
KIO::FileCopyJob *job = KIO::file_copy(QUrl::fromLocalFile(metaPath), QUrl::fromLocalFile(service), -1, KIO::HideProgressInfo);
const bool ok = job->exec();
const QString errorString = job->errorString();
#else
=======
QString service = KStandardDirs::locateLocal("services", serviceName + ".desktop");
kDebug() << "************************** 4";
>>>>>>> origin/KDE/4.8
const bool ok = QFile::copy(metaPath, service);
kDebug() << "************************** 5";
if (ok) {
@ -948,9 +939,8 @@ PackagePrivate::PackagePrivate()
externalPaths(false),
valid(false)
{
<<<<<<< HEAD
contentsPrefixPaths << "contents/";
=======
QString serviceName("plasma-applet-" + data.pluginName());
QString service = KStandardDirs::locateLocal("services", serviceName + ".desktop");
@ -1040,7 +1030,6 @@ PackagePrivate::PackagePrivate(const PackageStructure::Ptr st, const QString &pa
}
valid = structure && !structure->path().isEmpty();
>>>>>>> origin/KDE/4.8
}
PackagePrivate::PackagePrivate(const PackagePrivate &other)