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

The following commit has been merged in the master branch:
commit de9926a57222f7c4bd0303dab7c980b781f8e366
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Jun 5 01:14:01 2014 +0200

    Port to changes in kcoreaddons
---
 tests/contact-list-model-view-main.cpp | 4 ++--
 tools/debugger/main.cpp                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/contact-list-model-view-main.cpp b/tests/contact-list-model-view-main.cpp
index ee9387e..1e78eaa 100644
--- a/tests/contact-list-model-view-main.cpp
+++ b/tests/contact-list-model-view-main.cpp
@@ -43,13 +43,13 @@
 int main(int argc, char *argv[])
 {
     KAboutData aboutData(QStringLiteral("telepathy-kde-models-test-ui"),
-                         QString(),
                          i18n("Telepathy KDE Models Test UI"),
                          QStringLiteral("0.1"),
                          i18n("Telepathy KDE Models Test UI"),
-                         KAboutData::License_LGPL,
+                         KAboutLicense::LGPL,
                          i18n("(C) 2011 Collabora Ltd"));
 
+    KAboutData::setApplicationData(aboutData);
     QApplication app(argc, argv);
 
     QCommandLineParser parser;
diff --git a/tools/debugger/main.cpp b/tools/debugger/main.cpp
index 71c3758..dc5974b 100644
--- a/tools/debugger/main.cpp
+++ b/tools/debugger/main.cpp
@@ -26,11 +26,11 @@
 
 int main(int argc, char **argv)
 {
-    KAboutData aboutData(QStringLiteral("ktp-debugger"), QString(),
+    KAboutData aboutData(QStringLiteral("ktp-debugger"),
             i18n("KDE Telepathy Debug Tool"),
             QStringLiteral(KTP_VERSION),
             i18n("Tool for inspecting logs of the various underlying telepathy components"),
-            KAboutData::License_LGPL,
+            KAboutLicense::LGPL,
             i18n("Copyright (C) 2011 Collabora Ltd."));
     aboutData.addAuthor(i18n("George Kiagiadakis"), i18n("Developer"),
                         QStringLiteral("george.kiagiadakis at collabora.com"));

-- 
ktp-common-internals packaging