Do not export the DBusConnectionPool method. Instead simply compile i…

…t into libnepomukquery. This should fix linking problems with gold. svn path=/trunk/KDE/kdelibs/; revision=1132875
KDE · May 31, 2010 · 04194e0 · 04194e0
1 parent 6949dc3
commit 04194e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nepomuk/core/dbusconnectionpool.h b/nepomuk/core/dbusconnectionpool.h
@@ -23,17 +23,16 @@
 
 #include <QtDBus/QDBusConnection>
 
-#include "nepomuk_export.h"
-
 namespace DBusConnectionPool
 {
 /**
  * The DBusConnectionPool works around the problem
  * of QDBusConnection not being thread-safe. As soon as that
  * has been fixed (either directly in libdbus or with a work-
- * around in Qt) this method can be dropped.
+ * around in Qt) this method can be dropped in favor of
+ * QDBusConnection::sessionBus().
  */
-NEPOMUK_EXPORT QDBusConnection threadConnection();
+QDBusConnection threadConnection();
 }
 
 #endif

diff --git a/nepomuk/query/CMakeLists.txt b/nepomuk/query/CMakeLists.txt
@@ -34,6 +34,7 @@ set(nepomukquery_SRC
   result.cpp
   queryserviceclient.cpp
   dbusoperators.cpp
+  ../core/dbusconnectionpool.cpp
 )
 
 soprano_add_ontology(nepomukquery_SRC "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig" "NIE" "Nepomuk::Vocabulary" "trig")