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

Revert "Install header for Dialog so it's publically subclassable as discussed."

Browse Source 
This reverts commit baff217874.
This commit is contained in:
Eike Hein 2014-04-23 19:48:04 +02:00
parent baff217874
commit 1e5524525f
8 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/plasmaquick/CMakeLists.txt
View File

@ -85,25 +85,23 @@ set_target_properties(KF5PlasmaQuick PROPERTIES
install(TARGETS KF5PlasmaQuick EXPORT KF5PlasmaQuickTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
generate_export_header(KF5PlasmaQuick
BASE_NAME PlasmaQuick
EXPORT_FILE_NAME plasmaquick/plasmaquick_export.h)
generate_export_header(KF5PlasmaQuick BASE_NAME PlasmaQuick)
ecm_generate_headers(PlasmaQuick_CamelCase_HEADERS
HEADER_NAMES
Dialog
REQUIRED_HEADERS PlasmaQuick_HEADERS
PREFIX PlasmaQuick
set(plasmaquick_LIB_INCLUDES
${CMAKE_CURRENT_BINARY_DIR}/plasmaquick_export.h
appletquickitem.h
view.h
configview.h
configmodel.h
packageurlinterceptor.h
)
install(FILES
${PlasmaQuick_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/plasmaquick/plasmaquick_export.h
DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
#install(FILES ${plasmaquick_LIB_INCLUDES}
# DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
install(FILES
${PlasmaQuick_CamelCase_HEADERS}
DESTINATION ${INCLUDE_INSTALL_DIR}/PlasmaQuick COMPONENT Devel)
#install(DIRECTORY
# includes/PlasmaQuick
# DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5PlasmaQuick")

2
src/plasmaquick/appletquickitem.h
View File

@ -28,7 +28,7 @@
#include <Plasma/Package>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
//
// W A R N I N G

2
src/plasmaquick/configmodel.h
View File

@ -24,7 +24,7 @@
#include <QQmlListProperty>
#include <QAbstractListModel>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
//
// W A R N I N G

2
src/plasmaquick/configview.h
View File

@ -23,7 +23,7 @@
#include <QQuickView>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
//
// W A R N I N G

2
src/plasmaquick/dialog.h
View File

@ -31,7 +31,7 @@
#include <netwm_def.h>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
//
// W A R N I N G

2
src/plasmaquick/packageurlinterceptor.h
View File

@ -22,7 +22,7 @@
#include <QQmlAbstractUrlInterceptor>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
#include <Plasma/Package>

2
src/plasmaquick/shellpluginloader.h
View File

@ -22,7 +22,7 @@
#include <Plasma/PluginLoader>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
class PLASMAQUICK_EXPORT ShellPluginLoader : public Plasma::PluginLoader
{

4
src/plasmaquick/view.h
View File

@ -21,7 +21,7 @@
#include <QtQuick/QQuickView>
#include <plasmaquick/plasmaquick_export.h>
#include <plasmaquick_export.h>
#include "plasma/corona.h"
#include "plasma/containment.h"
@ -81,7 +81,7 @@ public:
* @return the location of this View
**/
Plasma::Types::Location location() const;
/**
* Sets the location of the View
* @param location the location of the View