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

Unbreak build of code using plasma-framework

Browse Source 
plasma_export.h is now installed in include/plasma/, not in include/.
Code using plasma-framework does not have include/plasma in its include
directory list, so plasma-framework headers must refer to others using
</plasma/foo.h>, not "foo.h".

CCMAIL: aleixpol@kde.org
This commit is contained in:
Aurélien Gâteau 2014-03-18 12:01:20 +01:00
parent cc6a87cee4
commit 43e2b0f670
17 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasma/CMakeLists.txt
View File

@ -145,7 +145,9 @@ set_target_properties(KF5Plasma PROPERTIES
)
########### install files ###############
generate_export_header(KF5Plasma BASE_NAME Plasma)
generate_export_header(KF5Plasma
BASE_NAME Plasma
EXPORT_FILE_NAME plasma/plasma_export.h)
ecm_generate_headers(Plasma_CamelCase_HEADERS
HEADER_NAMES
Applet
@ -172,7 +174,7 @@ ecm_generate_headers(Plasma_CamelCase_HEADERS
install(FILES
${Plasma_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
${CMAKE_CURRENT_BINARY_DIR}/plasma/plasma_export.h
version.h
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)

2
src/plasma/configloader.h
View File

@ -24,7 +24,7 @@
#include <kconfigskeleton.h>
#include <ksharedconfig.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
/**
* @class ConfigLoader plasma/configloader.h <Plasma/ConfigLoader>

2
src/plasma/corona.h
View File

@ -24,7 +24,7 @@
#include <plasma/containment.h>
#include <plasma/plasma.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
class QAction;

2
src/plasma/datacontainer.h
View File

@ -25,7 +25,7 @@
#include <QtCore/QTimer>
#include <kjob.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/dataengine.h>
class QAbstractItemModel;

2
src/plasma/dataengineconsumer.h
View File

@ -22,7 +22,7 @@
#include <QtCore/QUrl>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
namespace Plasma
{

2
src/plasma/framesvg.h
View File

@ -24,7 +24,7 @@
#include <QtCore/QObject>
#include <QPixmap>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/plasma.h>
#include <plasma/svg.h>

2
src/plasma/package.h
View File

@ -25,7 +25,7 @@
#include <kplugininfo.h>
#include <plasma/plasma.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
class KJob;

2
src/plasma/packagestructure.h
View File

@ -25,7 +25,7 @@
#include <kplugininfo.h>
#include <plasma/plasma.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/package.h>
namespace Plasma

2
src/plasma/plasma.h
View File

@ -24,7 +24,7 @@
#include <QPainterPath>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
class QAction;

2
src/plasma/scripting/appletscript.h
View File

@ -27,7 +27,7 @@
#include <kplugininfo.h>
#include <plasma/containment.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/scripting/scriptengine.h>
class QAction;

2
src/plasma/scripting/dataenginescript.h
View File

@ -22,7 +22,7 @@
#include <kplugininfo.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/dataengine.h>
#include <plasma/scripting/scriptengine.h>

2
src/plasma/scripting/scriptengine.h
View File

@ -21,7 +21,7 @@
#define PLASMA_SCRIPTENGINE_H
#include <plasma/package.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/plasma.h>
#include <QtCore/QObject>

2
src/plasma/service.h
View File

@ -26,7 +26,7 @@
#include <kconfiggroup.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma/plasma.h>
class QIODevice;

2
src/plasma/servicejob.h
View File

@ -24,7 +24,7 @@
#include <kjob.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
namespace Plasma
{

2
src/plasma/svg.h
View File

@ -23,7 +23,7 @@
#include <QtCore/QObject>
#include <QPixmap>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
class QPainter;
class QPoint;

2
src/plasma/theme.h
View File

@ -28,7 +28,7 @@
#include <kplugininfo.h>
#include <ksharedconfig.h>
#include "plasma_export.h"
#include <plasma/plasma_export.h>
namespace Plasma
{

2
src/plasma/version.h
View File

@ -22,7 +22,7 @@
/** @file plasma/version.h <Plasma/Version> */
#include "plasma_export.h"
#include <plasma/plasma_export.h>
#include <plasma_version.h>
#define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))