From 5534b9cfa000878e2ea1d705c8c9859725e7bef3 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 16 Jun 2012 22:06:11 +0200 Subject: [PATCH] plasma ported to generate_export_header -- this was the last one. --- CMakeLists.txt | 4 +++- plasma_export.h | 43 ------------------------------------------- widgets/lineedit.h | 4 ++-- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 plasma_export.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 05e8b08cf..2eca0dcad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ endif(NOT Q_WS_X11) include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES} ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative @@ -325,6 +326,7 @@ install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_AR install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### +generate_export_header(plasma) set(plasma_LIB_INCLUDES abstractdialogmanager.h @@ -349,7 +351,7 @@ set(plasma_LIB_INCLUDES package.h packagestructure.h plasma.h - plasma_export.h + ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h popupapplet.h querymatch.h remote/accessappletjob.h diff --git a/plasma_export.h b/plasma_export.h deleted file mode 100644 index 9f87be1ea..000000000 --- a/plasma_export.h +++ /dev/null @@ -1,43 +0,0 @@ -/* This file is part of the KDE project - Copyright 2007 Aaron Seigo - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef PLASMA_EXPORT_H -#define PLASMA_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -#ifndef PLASMA_EXPORT -# if defined(KDELIBS_STATIC_LIBS) - /* No export/import for static libraries */ -# define PLASMA_EXPORT -# elif defined(MAKE_PLASMA_LIB) - /* We are building this library */ -# define PLASMA_EXPORT KDE_EXPORT -# else - /* We are using this library */ -# define PLASMA_EXPORT KDE_IMPORT -# endif -#endif - -# ifndef PLASMA_EXPORT_DEPRECATED -# define PLASMA_EXPORT_DEPRECATED KDE_DEPRECATED PLASMA_EXPORT -# endif - -#endif diff --git a/widgets/lineedit.h b/widgets/lineedit.h index 43d3a39e4..1d35ad312 100644 --- a/widgets/lineedit.h +++ b/widgets/lineedit.h @@ -86,7 +86,7 @@ public: * @deprecated use LineEdit::setPlaceholderText instead */ #ifndef KDE_NO_DEPRECATED - void KDE_DEPRECATED setClickMessage(const QString &message); + void PLASMA_DEPRECATED setClickMessage(const QString &message); #endif /** @@ -95,7 +95,7 @@ public: * @deprecated use LineEdit::placeholderText instead */ #ifndef KDE_NO_DEPRECATED - QString KDE_DEPRECATED clickMessage() const; + QString PLASMA_DEPRECATED clickMessage() const; #endif /**