[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=396966d

The following commit has been merged in the master branch:
commit 396966d9cbdfb993e5aba94ccec1352fbdd063b4
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 13:35:18 2012 +1100

    Removed ConversationTarget from registerTypes().
---
 KTp/Declarative/conversation-target.cpp | 1 -
 KTp/Declarative/conversation-target.h   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 9997dc8..6befd38 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -145,4 +145,3 @@ ConversationTarget::~ConversationTarget()
 {
     delete d;
 }
-
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index 139c007..864296d 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -73,5 +73,6 @@ private:
     ConversationTargetPrivate *d;
 };
 
+Q_DECLARE_METATYPE(ConversationTarget*)
+
 #endif // CONVERSATION_TARGET_H
-// kate: indent-mode cstyle; space-indent on; indent-width 4; replace-tabs on; 

-- 
ktp-common-internals packaging