[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/16.04.2-1-16-g8f26764

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 10 17:03:35 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=5bcdb66

The following commit has been merged in the master branch:
commit 5bcdb66f74c6b9f2f66516d57dac9c644e9449b2
Author: David Faure <faure at kde.org>
Date:   Sun Jun 19 12:54:10 2016 +0200

    add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation
---
 CMakeLists.txt                                    | 2 ++
 src/handle-incoming-file-transfer-channel-job.cpp | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aede90..fcc61eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ include(KDECompilerSettings)
 include(ECMSetupVersion)
 include(FeatureSummary)
 
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
 add_subdirectory(src)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 5d87510..b0d02e7 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -188,8 +188,8 @@ void HandleIncomingFileTransferChannelJobPrivate::start()
             KRecentDirs::add(recentDirClass, url.toLocalFile());
         }
 
+        partUrl = url;
         partUrl.setPath(url.path() + QLatin1String(".part"));
-        partUrl.setScheme(QLatin1String("file"));
 
         checkPartFile();
         return;
@@ -202,11 +202,10 @@ void HandleIncomingFileTransferChannelJobPrivate::checkFileExists()
 {
     Q_Q(HandleIncomingFileTransferChannelJob);
 
-    url = downloadDirectory + QLatin1Char('/') + channel->fileName();
-    url.setScheme(QLatin1String("file"));
+    url = QUrl::fromLocalFile(downloadDirectory + QLatin1Char('/') + channel->fileName());
 
-    partUrl = url.path() + QLatin1String(".part");
-    partUrl.setScheme(QLatin1String("file"));
+    partUrl = url;
+    partUrl.setPath(url.path() + QLatin1String(".part"));
 
     QFileInfo fileInfo(url.toLocalFile()); // TODO check if it is a dir?
     if (fileInfo.exists()) {

-- 
ktp-filetransfer-handler packaging



More information about the pkg-kde-commits mailing list