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

The following commit has been merged in the master branch:
commit ed7cd6cdd599d8d464af5c732d3ed7dbc8fb94ca
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Dec 15 16:38:30 2014 +0100

    Port tests away from KDELibs4Support
---
 tests/CMakeLists.txt              | 31 +++++++++++++------------------
 tests/kpeople-model-view-main.cpp | 25 ++++++++++---------------
 tests/roles-proxy-model.cpp       |  6 +++---
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 383da0e..ed01b3f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}
@@ -13,8 +12,6 @@ set(model_view_SRCS
 
 qt5_wrap_ui(model_view_SRCS model-view.ui)
 
-###
-
 add_executable(ktp_contact_list_model_view
     ${model_view_SRCS}
     contact-list-model-view-main.cpp
@@ -23,29 +20,27 @@ add_executable(ktp_contact_list_model_view
 target_link_libraries(ktp_contact_list_model_view
   Qt5::Test
   
+  KF5::CoreAddons
+  KF5::I18n
   KTp::CommonInternals
   KTp::Models
-  KF5::KDELibs4Support
 )
 
 if (KF5People_FOUND)
 
-include_directories(${KPEOPLE_INCLUDES})
+    add_executable(ktp_kpeople_list_model_view
+        ${model_view_SRCS}
+        kpeople-model-view-main.cpp
+    )
 
+    target_link_libraries(ktp_kpeople_list_model_view
+    Qt5::Test
 
-add_executable(ktp_kpeople_list_model_view
-    ${model_view_SRCS}
-    kpeople-model-view-main.cpp
-)
-
-target_link_libraries(ktp_kpeople_list_model_view
-  Qt5::Test
-  
-  KF5::KDELibs4Support
-  KF5::People
-  KTp::CommonInternals
-  KTp::Models
-)
+    KF5::I18n
+    KF5::People
+    KTp::CommonInternals
+    KTp::Models
+    )
 
 endif ()
 
diff --git a/tests/kpeople-model-view-main.cpp b/tests/kpeople-model-view-main.cpp
index 377364a..7ff02b6 100644
--- a/tests/kpeople-model-view-main.cpp
+++ b/tests/kpeople-model-view-main.cpp
@@ -20,10 +20,8 @@
 
 #include "model-view.h"
 
-#include <K4AboutData>
-#include <KCmdLineArgs>
-#include <KDebug>
-#include <KApplication>
+#include <KAboutData>
+#include <KLocalizedString>
 
 #include <TelepathyQt/Types>
 #include <TelepathyQt/Debug>
@@ -43,17 +41,14 @@
 
 int main(int argc, char *argv[])
 {
-    K4AboutData aboutData("telepathy-kde-models-test-ui",
-                         0,
-                         ki18n("Telepathy KDE Models Test UI"),
-                         "0.1",
-                         ki18n("Telepathy KDE Models Test UI"),
-                         K4AboutData::License_LGPL,
-                         ki18n("(C) 2011 Collabora Ltd"));
-
-    KCmdLineArgs::init(argc, argv, &aboutData);
-
-    KApplication app;
+    QApplication app(argc, argv);
+    KAboutData aboutData(QStringLiteral("telepathy-kde-models-test-ui"),
+                         i18n("Telepathy KDE Models Test UI"),
+                         QStringLiteral("0.1"),
+                         i18n("Telepathy KDE Models Test UI"),
+                         KAboutLicense::LGPL,
+                         i18n("(C) 2011 Collabora Ltd"));
+    KAboutData::setApplicationData(aboutData);
 
     Tp::registerTypes();
     Tp::enableDebug(false);
diff --git a/tests/roles-proxy-model.cpp b/tests/roles-proxy-model.cpp
index b008356..5f08e89 100644
--- a/tests/roles-proxy-model.cpp
+++ b/tests/roles-proxy-model.cpp
@@ -21,17 +21,17 @@
 
 #include "roles-proxy-model.h"
 
-#include <KDebug>
+#include <QDebug>
 
 RolesProxyModel::RolesProxyModel(QObject *parent)
   : QAbstractProxyModel(parent)
 {
-    kDebug();
+    qDebug();
 }
 
 RolesProxyModel::~RolesProxyModel()
 {
-    kDebug();
+    qDebug();
 }
 
 void RolesProxyModel::setSourceModel(QAbstractItemModel *sourceModel)

-- 
ktp-common-internals packaging