diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-15 15:38:47 +0200 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-18 07:26:01 +0000 |
commit | 341ccc3b590d0a06157f29ce9237bc111e8cebf8 (patch) | |
tree | 3fe33c7eea11a5b0be96d81b226b61d90a8559b6 /src/corelib/mimetypes | |
parent | 48fd425ea8bbb79fad9800db7b8dbb1b35196142 (diff) |
Enable recursive expansion of simple qmake variables
Allow _expand_value to expand variables that may have more than
one level of expansion when the regular expression covers all
of the input. E.g.:
A = Foo
B = $$A/Bar
scope.expand('$$B')
While the original code was able to expand the string '$$B/source.cpp' to
'Foo/Bar/source.cpp', it could not expand the string '$$B' completely.
The latter would always return '$$A/Bar' instead of the expected 'Foo/Bar'
string.
A test case has been added which coveres the above example.
Change-Id: Ie3b5739c24ecbeb67d408dd204b0f54bab1d0f3f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/mimetypes')
0 files changed, 0 insertions, 0 deletions