diff options
| -rw-r--r-- | src/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/libdolphin_export.h | 14 | ||||
| -rw-r--r-- | src/tagcloud/tagcloud.h | 3 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ec2b5c56..94f512298 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -160,13 +160,14 @@ set(kcm_dolphin_PART_SRCS columnviewsettingspage.cpp detailsviewsettingspage.cpp dolphinfontrequester.cpp - dolphinsettings.cpp +# dolphinsettings.cpp generalviewsettingspage.cpp iconsizedialog.cpp iconsviewsettingspage.cpp pixmapviewer.cpp viewsettingspagebase.cpp - viewproperties.cpp) +# viewproperties.cpp +) kde4_add_kcfg_files(kcm_dolphin_PART_SRCS dolphin_columnmodesettings.kcfgc @@ -177,7 +178,7 @@ kde4_add_kcfg_files(kcm_dolphin_PART_SRCS kde4_add_plugin(kcm_dolphin ${kcm_dolphin_PART_SRCS}) -target_link_libraries(kcm_dolphin ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ) +target_link_libraries(kcm_dolphin ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) if (Nepomuk_FOUND) target_link_libraries(kcm_dolphin ${NEPOMUK_LIBRARIES}) endif (Nepomuk_FOUND) diff --git a/src/libdolphin_export.h b/src/libdolphin_export.h index 99af8bed2..4630398b8 100644 --- a/src/libdolphin_export.h +++ b/src/libdolphin_export.h @@ -26,16 +26,14 @@ /* needed, because e.g. Q_OS_UNIX is so frequently used */ #include <QtCore/QBool> -#ifdef MAKE_DOLPHINPRIVATE_LIB -# define LIBDOLPHINPRIVATE_EXPORT KDE_EXPORT -#else -# ifdef Q_OS_WIN -# define LIBDOLPHINPRIVATE_EXPORT KDE_IMPORT -# else +#ifndef LIBDOLPHINPRIVATE_EXPORT +# if defined(MAKE_DOLPHINPRIVATE_LIB) + /* We are building this library */ # define LIBDOLPHINPRIVATE_EXPORT KDE_EXPORT +# else + /* We are using this library */ +# define LIBDOLPHINPRIVATE_EXPORT KDE_IMPORT # endif #endif - #endif - diff --git a/src/tagcloud/tagcloud.h b/src/tagcloud/tagcloud.h index 2c641e7fb..9710ca9b7 100644 --- a/src/tagcloud/tagcloud.h +++ b/src/tagcloud/tagcloud.h @@ -24,7 +24,6 @@ #include <QtCore/QList> #include <nepomuk/tag.h> -#include <nepomuk/nepomuk_export.h> #include <Soprano/Statement> @@ -34,7 +33,7 @@ class QMouseEvent; class QEvent; namespace Nepomuk { - class NEPOMUK_EXPORT TagCloud : public QFrame + class TagCloud : public QFrame { Q_OBJECT |