public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/
Date: Sun,  3 Dec 2017 12:34:58 +0000 (UTC)	[thread overview]
Message-ID: <1512304465.5a107eef27605e919f62c306d1f1755fc81ab304.asturm@gentoo> (raw)

commit:     5a107eef27605e919f62c306d1f1755fc81ab304
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 12:24:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 12:34:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a107eef

kde-frameworks/kio: Fix build with Qt-5.7.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch | 6 ++++--
 1 file 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);


             reply	other threads:[~2017-12-03 12:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-03 12:34 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-02-09  9:52 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/ Andreas Sturmlechner
2022-07-19 15:42 Andreas Sturmlechner
2023-12-24 23:01 Conrad Kostecki
2024-03-05  9:18 Petr Vaněk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1512304465.5a107eef27605e919f62c306d1f1755fc81ab304.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox