summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-03 13:24:34 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-03 13:34:25 +0100
commit5a107eef27605e919f62c306d1f1755fc81ab304 (patch)
treebdfd5db2e057255b17faaee8c13fc5b11f91a75d /kde-frameworks/kio
parentmedia-sound/mpg123: Removed old. (diff)
downloadgentoo-5a107eef27605e919f62c306d1f1755fc81ab304.tar.gz
gentoo-5a107eef27605e919f62c306d1f1755fc81ab304.tar.bz2
gentoo-5a107eef27605e919f62c306d1f1755fc81ab304.zip
kde-frameworks/kio: Fix build with Qt-5.7.1
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r--kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
index d9cf7402741..503a8c77378 100644
--- a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
+++ b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
@@ -21,6 +21,8 @@ Reviewers: #frameworks, dfaure
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D8836
+
+* asturm: Fix build with Qt-5.7.1
---
src/core/mkpathjob.cpp | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
@@ -37,7 +39,7 @@ index bff46ca..a177805 100644
- m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
+ const QString pathComponent = m_pathComponents.at(i);
+ if (pathComponent == basePathComponents.at(i)) {
-+ if (m_url.path() == QLatin1Char('/')) {
++ if (m_url.path() == QLatin1String("/")) {
+ m_url.setPath(m_url.path() + pathComponent);
+ } else {
+ m_url.setPath(m_url.path() + '/' + pathComponent);
@@ -52,7 +54,7 @@ index bff46ca..a177805 100644
- QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i);
+ const QString localFile = m_url.toLocalFile();
+ QString testDir;
-+ if (localFile == QLatin1Char('/')) {
++ if (localFile == QLatin1String("/")) {
+ testDir = localFile + m_pathComponents.at(i);
+ } else {
+ testDir = localFile + '/' + m_pathComponents.at(i);