[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=788f5ce

The following commit has been merged in the master branch:
commit 788f5cecc2554539cbbd78c3229615a194536dcd
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Jan 13 13:17:02 2015 +0100

    Fix build
    
    Seems like KDELibs4Support dependency is still needed in some places.
    Fix some wrongly-cased includes.
    
    CCMAIL: Martin Klapetek <mklapetek at kde.org>
---
 adiumxtra-protocol-handler/CMakeLists.txt | 1 +
 app/chat-window.cpp                       | 2 +-
 config/messages-config.h                  | 2 +-
 logviewer/CMakeLists.txt                  | 1 +
 logviewer/config/CMakeLists.txt           | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/adiumxtra-protocol-handler/CMakeLists.txt b/adiumxtra-protocol-handler/CMakeLists.txt
index f78a62f..de72318 100644
--- a/adiumxtra-protocol-handler/CMakeLists.txt
+++ b/adiumxtra-protocol-handler/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries(ktp-adiumxtra-protocol-handler
             KF5::Emoticons
             Qt5::Xml
             KF5::KIOWidgets
+            KF5::KDELibs4Support
             ktpchat)
 
 
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index cdbcf6c..31f485b 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -33,7 +33,7 @@
 #include <KLocalizedString>
 #include <KActionCollection>
 #include <KColorScheme>
-#include <KSettings/Dialog>
+#include <ksettings/dialog.h>
 #include <kcmodulecontainer.h>
 #include <KNotification>
 #include <KNotifyConfigWidget>
diff --git a/config/messages-config.h b/config/messages-config.h
index 3deb78b..eb869de 100644
--- a/config/messages-config.h
+++ b/config/messages-config.h
@@ -19,7 +19,7 @@
 #ifndef KCM_MESSAGES_H
 #define KCM_MESSAGES_H
 
-#include <KSettings/pluginpage.h>
+#include <ksettings/pluginpage.h>
 
 class MessagesConfig : public KSettings::PluginPage
 {
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index ac3dde0..6351937 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(ktp-log-viewer
             KF5::Emoticons
             KF5::KCMUtils
             KF5::WebKit
+            KF5::KDELibs4Support
             KTp::CommonInternals
             KTp::Logger
             KTp::Models
diff --git a/logviewer/config/CMakeLists.txt b/logviewer/config/CMakeLists.txt
index bf29b1e..0a2f2f6 100644
--- a/logviewer/config/CMakeLists.txt
+++ b/logviewer/config/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(kcm_ktp_logviewer_behavior MODULE ${kcm_ktp_logviewer_behavior_SRCS}
 
 target_link_libraries(kcm_ktp_logviewer_behavior
     KF5::KCMUtils
+    KF5::KDELibs4Support
     ktpchat
 )
 

-- 
ktp-text-ui packaging