diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-03-02 12:30:44 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-05-04 08:47:18 +0000 |
| commit | 5a79a9ea41ab1223edc39b6c594a682cb079dd18 (patch) | |
| tree | c94db5fbb07fc0550fe3eed998ed54f5542569c6 /src/corelib/io/qtemporaryfile.cpp | |
| parent | 554e44b77de8df75cfa7b9a4dc81a795509e7de9 (diff) | |
Make sure $$relative_path() uses an absolute path as its first arg
Thanks to QTBUG-61373, this qmake function was called with
/usr/local/5.10.1 as baseDir, which isn't absolute, leading to an
assertion failure. We could raise the error within qmake but it
proved easier to simply resolve any non-absolute baseDir using PWD,
before trying to use it as an absolute path.
Did the same for $$absolute_path(). Documented both. Adjusted the
assert that caught this to report any non-absolute path that upsets
it. Added simple tests, fixed an existing test.
Task-number: QTBUG-66156
Change-Id: Icfef2e2f5b236e071177c9beffa38d71bf404292
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from commit 58b373c9e3c0a7307e3fbafeb5ad710088b8e685)
Diffstat (limited to 'src/corelib/io/qtemporaryfile.cpp')
0 files changed, 0 insertions, 0 deletions