This amends commit c023016ffd to revert
all of the following commits:
214fbc658b492c646735804b099674e457668468a1610c6c68
The reason for this is that they introduce a behavior change in QUrl,
causing the normalization/resolution of file:// directory paths not to
end in "/" and this behavior change revealed buggy code in QML that
concatenated strings expecting the slash to be there. Commit
c023016ffd attempted to do that too, but it left QUrl in a state
that introduced a regression from 6.7.
Discussion on whether we will accept this behavior change (and require
fixes to buggy code) or keep the old behavior to avoid breakages will
happen for 6.8.x.
This commit reintroduces bug QTBUG-120396 to 6.8.0.
Task-number: QTBUG-120396
Fixes: QTBUG-128940
Change-Id: Id78899df1cea4321d9e1fffdcc0f406bbfd534b8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
e8122a0a9c