Differential D8836

Fix KIO::mkpath with qtbase 5.10 beta 4
ClosedPublic
Actions

Authored by elvisangelaccio on Nov 16 2017, 9:46 AM.

Details

Reviewers
dfaure
thiago
Group Reviewers
Frameworks
Commits
R241:2353119aae8f: Fix KIO::mkpath with qtbase 5.10 beta 4
Summary

The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests, since url.setPath("//foo") will now result in an invalid (empty) QUrl.

This patch fixes the KIO::mkpath() case.

[1]: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7

Test Plan
  • I can now create folders from dolphin and plasma.
  • fileundomanagertest and mkpathjobtest no longer fail

Diff Detail

Repository
R241 KIO
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
Restricted Application added a project: Frameworks. · View Herald TranscriptNov 16 2017, 9:46 AM
dfaure accepted this revision.Nov 16 2017, 9:47 AM
dfaure added a reviewer: thiago.

Urgh. That QUrl change doesn't make things easy for this type of code indeed.

This revision is now accepted and ready to land.Nov 16 2017, 9:48 AM
elvisangelaccio updated this revision to Diff 22432.Nov 16 2017, 10:27 AM
  • Fix also mkpathjobtest and fileundomanagertest
dfaure added inline comments.Nov 16 2017, 10:28 AM
src/core/mkpathjob.cpp
45–46

I think it's time to put m_pathComponents.at(i) into a local variable ;-)

66

same here with m_url.toLocalFile()

elvisangelaccio updated this revision to Diff 22433.Nov 16 2017, 10:43 AM
  • Use local variables
elvisangelaccio marked 2 inline comments as done.Nov 16 2017, 10:44 AM
elvisangelaccio edited the summary of this revision. (Show Details)Nov 16 2017, 10:51 AM
elvisangelaccio edited the test plan for this revision. (Show Details)
dfaure accepted this revision.Nov 16 2017, 10:54 AM
Closed by commit R241:2353119aae8f: Fix KIO::mkpath with qtbase 5.10 beta 4 (authored by elvisangelaccio). · Explain WhyNov 16 2017, 11:14 AM
This revision was automatically updated to reflect the committed changes.
elvisangelaccio mentioned this in R241:05938a167dd4: Fix testtrash with qtbase 5.10 beta 4.

Revision Contents
Changeset List

PathPackages
Msrc/core/mkpathjob.cpp (17 lines)

Diff 22436

View Options

src/core/mkpathjob.cpp

Loading...