From 2a380a997ca6a5c4d1d2b531831d392877389f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Wed, 3 Apr 2024 11:31:09 +0200 Subject: Fixup "Add option to chose python version for building 5.15 WebEngine" It caused conflicts in top-level windows builds due to duplicate names for python tests. Change-Id: I869d7a87a8c562f9bf601fa9545d9a40df2a4166 Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 17fd3176988586168bee8654008a097a5f23ec1d) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/features/functions.prf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mkspecs/features/functions.prf') diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 65500776b..7f630588a 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -44,11 +44,11 @@ defineReplace(which) { # Returns the unquoted path to the python executable. defineReplace(pythonPath) { - isEmpty(QMAKE_PYTHON) { + isEmpty(QMAKE_PYTHON2) { # Fallback for building QtWebEngine with Qt < 5.8 - QMAKE_PYTHON = python + QMAKE_PYTHON2 = python } - return($$QMAKE_PYTHON) + return($$QMAKE_PYTHON2) } # Returns the python executable for use with shell / make targets. -- cgit v1.2.3