dfaure added a comment. I see. This answers my question about why two merge requests -- no problem, keep them separate, but commit the fix before the unittest [this is so that bisecting never ends up in the situation where unittests are broken] You can also ignore my suggestion about fileName(QUrl::FullyEncoded) if you're afraid it won't be symmetrical, no problem. The rest of mardelle's comment looks sensible to me as well. REPOSITORY R244 KCoreAddons REVISION DETAIL https://phabricator.kde.org/D24489 To: mardelle, #frameworks, dfaure, mpyne Cc: ahmadsamir, kde-frameworks-devel, LeGast00n, GB_2, michaelh, ngraham, bruns