fix exports and use dolphinprivatelib in the part

svn path=/trunk/KDE/kdebase/apps/; revision=789835

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ec2b5c5673e5db7941684d31888ca659e92fc90..94f5122983facb30d80bdab274d5414082862429 100644 (file)
--- 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 99af8bed2dad897cf29c134a7043f27fc175dfc4..4630398b8850225012d3163ea574390634cde31b 100644 (file)
--- 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 2c641e7fbd66f55e4a61221d3bde9421b74115e5..9710ca9b7aacba601b0c7f6af1d66d3e3525e8c8 100644 (file)
--- 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