[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=10f34fd

The following commit has been merged in the master branch:
commit 10f34fd576db3e7b85cdb9cbe0e7f790f1c86665
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Dec 22 11:57:53 2014 +0100

    [Models/contacts-model] Use QSharedPointer rather than QWeakPointer
    
    We already create QSharedPointers, but QWeakPointer wasn't happy with
    getting QSharedPointer passed and stayed null, which resulted in empty
    contact list.
    
    Now the list should be back to normal again.
    
    Reviewed-by: David Edmundson
---
 KTp/Models/contacts-model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index 0a168e9..bf7c685 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -44,7 +44,7 @@ class ContactsModel::Private
 public:
     GroupMode groupMode;
     bool trackUnread;
-    QWeakPointer<KTp::AbstractGroupingProxyModel> proxy;
+    QSharedPointer<KTp::AbstractGroupingProxyModel> proxy;
     QAbstractItemModel *source;
     Tp::AccountManagerPtr accountManager;
     Tp::ClientRegistrarPtr clientRegistrar;

-- 
ktp-common-internals packaging