[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-26-g1aa74a8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fc629df

The following commit has been merged in the master branch:
commit fc629df58442a74abb8b627de4fe692bc9ed3744
Author: David Faure <faure at kde.org>
Date:   Mon Jun 20 16:55:16 2016 +0200

    add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation
---
 CMakeLists.txt                                   | 1 +
 kpeople/actionsplugin/kpeople-actions-plugin.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d54d44..1da85c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ add_definitions (
                  -DQT_NO_KEYWORDS
                  -std=c++11
 )
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 include_directories (
                      ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index dd3e708..75ad49d 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -190,7 +190,7 @@ QList<QAction*> KPeopleActionsPlugin::actionsForPerson(const KPeople::PersonData
             QAction *action = new IMAction(i18nc("Context menu action; means 'Bring your account online and then start a chat using %1 account'",
                                                  "Connect and Start Chat Using %1...", account->displayName()),
                                            QIcon::fromTheme(QStringLiteral("text-x-generic")),
-                                           contactId,
+                                           QUrl(contactId),
                                            TextChannel,
                                            parent);
             action->setProperty("accountPath", accountPath);
@@ -254,7 +254,7 @@ QList<QAction*> KPeopleActionsPlugin::actionsForPerson(const KPeople::PersonData
 
     QAction *action = new IMAction(i18n("Previous Conversations..."),
                                    QIcon::fromTheme(QStringLiteral("documentation")),
-                                   person.personUri(),
+                                   QUrl(person.personUri()),
                                    LogViewer,
                                    parent);
     connect(action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
@@ -292,8 +292,8 @@ void KPeopleActionsPlugin::onActionTriggered()
             KTp::Actions::openLogViewer(action->uri());
             break;
         case CollabEditing: {
-            const QUrl file = QFileDialog::getOpenFileName(Q_NULLPTR, i18n("Choose a file to edit with %1", contact->alias()),
-                                                           QStringLiteral("kfiledialog:///CollabEditingLastDirectory"));
+            const QUrl file = QUrl::fromLocalFile(QFileDialog::getOpenFileName(Q_NULLPTR, i18n("Choose a file to edit with %1", contact->alias()),
+                                                           QStringLiteral("kfiledialog:///CollabEditingLastDirectory")));
             KTp::Actions::startCollaborativeEditing(account, contact, QList<QUrl>() << file, true);
             break;
         }

-- 
ktp-common-internals packaging