[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=060bc62

The following commit has been merged in the master branch:
commit 060bc624cbfab654e7145b2af5f3c82355c279ce
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Aug 26 15:06:45 2013 +0200

    Fix build
---
 KTp/Logger/log-search-hit.h                | 4 +++-
 KTp/Logger/pending-logger-search.cpp       | 3 ---
 KTp/Logger/pending-logger-search.h         | 4 +++-
 KTp/Logger/plugins/tplogger/CMakeLists.txt | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/KTp/Logger/log-search-hit.h b/KTp/Logger/log-search-hit.h
index 5daa955..b90a4a8 100644
--- a/KTp/Logger/log-search-hit.h
+++ b/KTp/Logger/log-search-hit.h
@@ -19,7 +19,9 @@
 
 #ifndef KTP_LOGSEARCHHIT_H
 #define KTP_LOGSEARCHHIT_H
+
 #include <TelepathyQt/Types>
+#include <KTp/ktp-export.h>
 
 namespace KTp {
 
@@ -34,7 +36,7 @@ class LogEntity;
  * @since 0.7
  * @author Daniel Vrátil <dvratil at redhat.com>
  */
-class LogSearchHit
+class KTP_EXPORT LogSearchHit
 {
   public:
     /**
diff --git a/KTp/Logger/pending-logger-search.cpp b/KTp/Logger/pending-logger-search.cpp
index f5bec61..6cb470f 100644
--- a/KTp/Logger/pending-logger-search.cpp
+++ b/KTp/Logger/pending-logger-search.cpp
@@ -63,6 +63,3 @@ void PendingLoggerSearch::appendSearchHits(const QList<LogSearchHit> &searchHits
 {
     d->searchHits << searchHits;
 }
-
-
-using namespace KTp;
diff --git a/KTp/Logger/pending-logger-search.h b/KTp/Logger/pending-logger-search.h
index d7015df..b0ae21d 100644
--- a/KTp/Logger/pending-logger-search.h
+++ b/KTp/Logger/pending-logger-search.h
@@ -23,6 +23,8 @@
 #include <KTp/Logger/pending-logger-operation.h>
 #include <KTp/Logger/log-search-hit.h>
 
+#include <KTp/ktp-export.h>
+
 namespace KTp {
 
 /**
@@ -36,7 +38,7 @@ namespace KTp {
  * @since 0.7
  * @author Daniel Vrátil <dvratil at redhat.com>
  */
-class PendingLoggerSearch : public  KTp::PendingLoggerOperation
+class KTP_EXPORT PendingLoggerSearch : public  KTp::PendingLoggerOperation
 {
     Q_OBJECT
 
diff --git a/KTp/Logger/plugins/tplogger/CMakeLists.txt b/KTp/Logger/plugins/tplogger/CMakeLists.txt
index 2acc076..fa1a600 100644
--- a/KTp/Logger/plugins/tplogger/CMakeLists.txt
+++ b/KTp/Logger/plugins/tplogger/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries (ktploggerplugin_tplogger
     ktpcommoninternalsprivate
     ktploggerprivate
     ${QT_LIBRARIES}
+    ${KDE4_KDECORE_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
     ${TELEPATHY_LOGGER_QT4_LIBRARIES}
 )

-- 
ktp-common-internals packaging