[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=a29b3be

The following commit has been merged in the master branch:
commit a29b3bea43e80a76ab6c37e7edddb0568fe0b208
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 16 19:09:37 2014 +0100

    Fix keople model proxy view test
---
 tests/CMakeLists.txt              | 1 +
 tests/kpeople-model-view-main.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8018c30..78a6e16 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(ktp_kpeople_list_model_view
   ${KDE4_KDECORE_LIBS}
   ${KDE4_KDEUI_LIBS}
   ${TELEPATHY_QT4_LIBRARIES}
+  ${KPEOPLE_LIBS}
   ktpcommoninternalsprivate
   ktpmodelsprivate
 )
diff --git a/tests/kpeople-model-view-main.cpp b/tests/kpeople-model-view-main.cpp
index fdd20a3..26f6a0f 100644
--- a/tests/kpeople-model-view-main.cpp
+++ b/tests/kpeople-model-view-main.cpp
@@ -32,6 +32,7 @@
 #include <TelepathyQt/AccountFactory>
 #include <TelepathyQt/ConnectionFactory>
 #include <TelepathyQt/TextChannel>
+#include <KPeople/PersonsModel>
 
 #include <QDBusConnection>
 
@@ -61,9 +62,11 @@ int main(int argc, char *argv[])
     
     const Tp::AccountManagerPtr accountManager = KTp::accountManager();
 
+    KPeople::PersonsModel *pm = new KPeople::PersonsModel(&app);
     KPeopleTranslationProxy *model = new KPeopleTranslationProxy(&app);
 //     model->setAccountManager(accountManager);
-    
+    model->setSourceModel(pm);
+
     // Set up and show the main widget
     ModelView *mainWidget = new ModelView(model, 0);
     mainWidget->show();

-- 
ktp-common-internals packaging