diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 1b1d75f76..90c020e38 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -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) diff --git a/src/plasma/configloader.h b/src/plasma/configloader.h index c77027298..cc1a6ccd0 100644 --- a/src/plasma/configloader.h +++ b/src/plasma/configloader.h @@ -24,7 +24,7 @@ #include #include -#include "plasma_export.h" +#include /** * @class ConfigLoader plasma/configloader.h diff --git a/src/plasma/corona.h b/src/plasma/corona.h index 7a8bfab30..8b8918efc 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -24,7 +24,7 @@ #include #include -#include "plasma_export.h" +#include class QAction; diff --git a/src/plasma/datacontainer.h b/src/plasma/datacontainer.h index d58d87a91..57fac3f59 100644 --- a/src/plasma/datacontainer.h +++ b/src/plasma/datacontainer.h @@ -25,7 +25,7 @@ #include #include -#include "plasma_export.h" +#include #include class QAbstractItemModel; diff --git a/src/plasma/dataengineconsumer.h b/src/plasma/dataengineconsumer.h index db7aebc13..d1c8d6b71 100644 --- a/src/plasma/dataengineconsumer.h +++ b/src/plasma/dataengineconsumer.h @@ -22,7 +22,7 @@ #include -#include "plasma_export.h" +#include namespace Plasma { diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h index dafa6ff6d..f4b166980 100644 --- a/src/plasma/framesvg.h +++ b/src/plasma/framesvg.h @@ -24,7 +24,7 @@ #include #include -#include "plasma_export.h" +#include #include #include diff --git a/src/plasma/package.h b/src/plasma/package.h index 23704b14b..afc04dd2e 100644 --- a/src/plasma/package.h +++ b/src/plasma/package.h @@ -25,7 +25,7 @@ #include #include -#include "plasma_export.h" +#include class KJob; diff --git a/src/plasma/packagestructure.h b/src/plasma/packagestructure.h index 521433c1d..1292f3db5 100644 --- a/src/plasma/packagestructure.h +++ b/src/plasma/packagestructure.h @@ -25,7 +25,7 @@ #include #include -#include "plasma_export.h" +#include #include namespace Plasma diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h index 5de5d3b57..c7048e788 100644 --- a/src/plasma/plasma.h +++ b/src/plasma/plasma.h @@ -24,7 +24,7 @@ #include -#include "plasma_export.h" +#include class QAction; diff --git a/src/plasma/scripting/appletscript.h b/src/plasma/scripting/appletscript.h index 77175f2c1..616139579 100644 --- a/src/plasma/scripting/appletscript.h +++ b/src/plasma/scripting/appletscript.h @@ -27,7 +27,7 @@ #include #include -#include "plasma_export.h" +#include #include class QAction; diff --git a/src/plasma/scripting/dataenginescript.h b/src/plasma/scripting/dataenginescript.h index e31353ee7..4618eacc0 100644 --- a/src/plasma/scripting/dataenginescript.h +++ b/src/plasma/scripting/dataenginescript.h @@ -22,7 +22,7 @@ #include -#include "plasma_export.h" +#include #include #include diff --git a/src/plasma/scripting/scriptengine.h b/src/plasma/scripting/scriptengine.h index bd014bf22..4844c0e11 100644 --- a/src/plasma/scripting/scriptengine.h +++ b/src/plasma/scripting/scriptengine.h @@ -21,7 +21,7 @@ #define PLASMA_SCRIPTENGINE_H #include -#include "plasma_export.h" +#include #include #include diff --git a/src/plasma/service.h b/src/plasma/service.h index deaf602f0..eff3aacd1 100644 --- a/src/plasma/service.h +++ b/src/plasma/service.h @@ -26,7 +26,7 @@ #include -#include "plasma_export.h" +#include #include class QIODevice; diff --git a/src/plasma/servicejob.h b/src/plasma/servicejob.h index a8901c14f..fa3b34635 100644 --- a/src/plasma/servicejob.h +++ b/src/plasma/servicejob.h @@ -24,7 +24,7 @@ #include -#include "plasma_export.h" +#include namespace Plasma { diff --git a/src/plasma/svg.h b/src/plasma/svg.h index 7bc77bdc6..e8bfe294b 100644 --- a/src/plasma/svg.h +++ b/src/plasma/svg.h @@ -23,7 +23,7 @@ #include #include -#include "plasma_export.h" +#include class QPainter; class QPoint; diff --git a/src/plasma/theme.h b/src/plasma/theme.h index c6100312e..42677fb1b 100644 --- a/src/plasma/theme.h +++ b/src/plasma/theme.h @@ -28,7 +28,7 @@ #include #include -#include "plasma_export.h" +#include namespace Plasma { diff --git a/src/plasma/version.h b/src/plasma/version.h index 1a7a91442..843bd3fc8 100644 --- a/src/plasma/version.h +++ b/src/plasma/version.h @@ -22,7 +22,7 @@ /** @file plasma/version.h */ -#include "plasma_export.h" +#include #include #define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))