[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=819a5c8

The following commit has been merged in the master branch:
commit 819a5c88309a7184b8be016ff88b1adf705141b1
Merge: 0f4237f52334ff51c49235780bfb6b8102a53a27 2ddc4985289430917fce86d3633ebf7c3a9699af
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Apr 14 01:17:38 2014 +0200

    Merge branch 'master' into frameworks

 KTp/Declarative/CMakeLists.txt        |  1 +
 KTp/Declarative/telepathy-manager.cpp | 81 +++++++++++++++++++++++++++++++++++
 KTp/Declarative/telepathy-manager.h   | 31 ++++++++++++++
 3 files changed, 113 insertions(+)

diff --cc KTp/Declarative/CMakeLists.txt
index 4bdff42,e6f2b50..31de0ef
--- a/KTp/Declarative/CMakeLists.txt
+++ b/KTp/Declarative/CMakeLists.txt
@@@ -26,7 -27,8 +26,8 @@@ target_link_libraries (ktpqmlplugi
      ktpcommoninternalsprivate
      ktploggerprivate
      ktpmodelsprivate
+     ktpwidgetsprivate
  )
  
 -install (TARGETS ktpqmlplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy)
 -install (FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy)
 +install (TARGETS ktpqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/telepathy)
 +install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/telepathy)
diff --cc KTp/Declarative/telepathy-manager.cpp
index 9f59da4,bd93b1f..b478234
--- a/KTp/Declarative/telepathy-manager.cpp
+++ b/KTp/Declarative/telepathy-manager.cpp
@@@ -25,8 -30,9 +30,9 @@@
  #include <TelepathyQt/ClientRegistrar>
  #include <TelepathyQt/AbstractClient>
  #include <TelepathyQt/TextChannel>
+ #include <TelepathyQt/PendingChannelRequest>
  
 -#include <QDeclarativeEngine>
 +#include <QQmlEngine>
  
  TelepathyManager::TelepathyManager(QObject *parent)
      : QObject(parent)

-- 
ktp-common-internals packaging