diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-11-05 16:55:08 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-01-13 18:18:10 +0000 |
commit | dd5e7f1a52c51061ad54e870df7f8e04c0f06fbe (patch) | |
tree | 296fda800c780d1f2415f8fe15e66fe1ee37312f /src/plugins | |
parent | 69bd238ad86abfe725d90707f3b578f5d766ba3c (diff) |
Use a more robust test for absolute paths in QDir
Its filePath() and absoluteFilePath() don't trust its own
isAbsolute(), due to some infelicities on MS-Win; and kludged round a
consequent problem with resource paths; but other virtual file systems
weren't catered for. Replace the convoluted test there with a static
bool function (so that future kludges in this area shall only need to
edit one place; and can document why they're needed) and use a more
robust test that handles all virtual file systems (by asking
QFileInfo) but falls back to QFileSystemEntry to work round the known
infelicities on MS-Win. Add regression test for asset library paths
issue on iOS. Ammends 27f1f84c1c2.
Moved a couple of local variables to after the early return, since it
doesn't need them, in the process.
Task-number: QTBUG-70237
Change-Id: Ib3954826df40ccf816beebe5c3751497e3bf6433
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions