[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=90f5a22

The following commit has been merged in the master branch:
commit 90f5a221fb3ab9bd9001381adf7bcf8073ba9f5d
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Apr 1 23:40:29 2015 +0200

    Make sure we're not automatically casting QString directly into QUrl
    
    Otherwise we often turn paths into URLs, a fix I pushed previously today
    and the ones I detected when adding -DQT_NO_URL_CAST_FROM_STRING.
    
    CCMAIL: kdeconnect at kde.org
---
 CMakeLists.txt                 | 2 ++
 plugins/share/share_config.cpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516f517..dbaa039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ include(FeatureSummary)
 
 include(KDEConnectMacros.cmake)
 
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
 include(GenerateExportHeader)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/plugins/share/share_config.cpp b/plugins/share/share_config.cpp
index c418534..818748b 100644
--- a/plugins/share/share_config.cpp
+++ b/plugins/share/share_config.cpp
@@ -46,7 +46,7 @@ void ShareConfig::defaults()
 {
     KCModule::defaults();
 
-    m_ui->kurlrequester->setUrl(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
+    m_ui->kurlrequester->setUrl(QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)));
 
     Q_EMIT changed(true);
 }
@@ -55,7 +55,7 @@ void ShareConfig::load()
 {
     KCModule::load();
 
-    m_ui->kurlrequester->setUrl(config()->get("incoming_path", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)));
+    m_ui->kurlrequester->setUrl(config()->get("incoming_path", QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))));
 
     Q_EMIT changed(false);
 }

-- 
kdeconnect packaging