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

fix build of libplasma merged from 4.10 branch into frameworks

Browse Source
This commit is contained in:
Aaron Seigo 2012-10-31 12:19:38 +01:00
parent 9b7b6054ee
commit 5f22041391
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packagestructure.cpp
View File

@ -18,34 +18,7 @@
*******************************************************************************/ *******************************************************************************/
#include "packagestructure.h" #include "packagestructure.h"
<<<<<<< HEAD
#include "private/package_p.h" #include "private/package_p.h"
=======
#include "config-plasma.h"
#include <QDir>
#include <QMap>
#include <QMutableListIterator>
#include <QFileInfo>
#include <kconfiggroup.h>
#include <kdebug.h>
#ifndef PLASMA_NO_KIO
#include <kio/job.h>
#endif
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kservicetypetrader.h>
#include <ktar.h>
#include <ktemporaryfile.h>
#include <ktempdir.h>
#include <kurl.h>
#include <kzip.h>
#include "package.h"
#include "private/packages_p.h"
#include "theme.h"
namespace Plasma namespace Plasma
{ {

2
private/packages.cpp
View File

@ -86,7 +86,7 @@ void PlasmoidPackage::initPackage(Package *package)
QStringList platform = KDeclarative::runtimePlatform(); QStringList platform = KDeclarative::runtimePlatform();
if (!platform.isEmpty()) { if (!platform.isEmpty()) {
platform.append("contents"); platform.append("contents");
setContentsPrefixPaths(platform); package->setContentsPrefixPaths(platform);
} }
package->setServicePrefix("plasma-applet-"); package->setServicePrefix("plasma-applet-");