diff options
| author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2024-04-03 11:31:09 +0200 |
|---|---|---|
| committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2024-04-03 12:40:23 +0200 |
| commit | 17fd3176988586168bee8654008a097a5f23ec1d (patch) | |
| tree | 1faf55264d9043236b930e658ef5964eb11c8075 /configure.pri | |
| parent | ece335f5a4d5b7029a9a10567901b0ffc2bb2704 (diff) | |
Fixup "Add option to chose python version for building 5.15 WebEngine"v5.15.17-lts-lgplv5.15.17-lts5.15.17
It caused conflicts in top-level windows builds due to duplicate names
for python tests.
Pick-to: 5.15
Change-Id: I869d7a87a8c562f9bf601fa9545d9a40df2a4166
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 99cdbf72b..cb53c93b0 100644 --- a/configure.pri +++ b/configure.pri @@ -49,7 +49,7 @@ defineTest(qtConfReport_jumboBuild) { qtConfReportPadded($${1}, $$mergeLimit) } -defineTest(qtConfTest_detectPython) { +defineTest(qtConfTest_detectPython2) { pythonOverride = $$eval(config.input.python_override) !isEmpty(pythonOverride) { python = $$qtConfFindInPath("$$pythonOverride$$EXE_SUFFIX") |
