Date: Thursday, March 17, 2022 @ 21:39:23 Author: arojas Revision: 439888
archrelease: copy trunk to extra-any Added: qt5-doc/repos/extra-any/PKGBUILD (from rev 439887, qt5-doc/trunk/PKGBUILD) qt5-doc/repos/extra-any/no-qmake.patch (from rev 439887, qt5-doc/trunk/no-qmake.patch) qt5-doc/repos/extra-any/qt5-webengine-python3.patch (from rev 439887, qt5-doc/trunk/qt5-webengine-python3.patch) Deleted: qt5-doc/repos/extra-any/PKGBUILD qt5-doc/repos/extra-any/qt5-webengine-python3.patch -----------------------------+ PKGBUILD | 166 ++++++++++------------ no-qmake.patch | 110 ++++++++++++++ qt5-webengine-python3.patch | 311 +++++++++++++++++++++--------------------- 3 files changed, 352 insertions(+), 235 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-03-17 21:38:57 UTC (rev 439887) +++ PKGBUILD 2022-03-17 21:39:23 UTC (rev 439888) @@ -1,85 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Michael Hansen <zrax0111 gmail com> - -pkgbase=qt5-doc -pkgname=(qt5-doc qt5-examples) -_qtver=5.15.2 -pkgver=${_qtver/-/} -pkgrel=2 -arch=('any') -url='https://www.qt.io' -license=('GPL3' 'LGPL3' 'FDL' 'custom') -makedepends=('qt5-tools' 'python' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite' - 'gperf' 'nss' 'clang') -groups=('qt' 'qt5') -_pkgfqn="qt-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz" - https://invent.kde.org/qt/qt/qtbase/-/commit/8252ef5f.patch - https://invent.kde.org/qt/qt/qtbase/-/commit/cb2da673.patch - qt5-webengine-python3.patch) -sha256sums=('3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240' - '8ab742b991ed5c43e8da4b1ce1982fd38fe611aaac3d57ee37728b59932b518a' - '33304570431c0dd3becc22f3f0911ccfc781a1ce6c7926c3acb08278cd2e60c3' - '54de45621463a7c07f87482fbcbb9eacbc60d840bb69b34bc6c776d1df720453') - -prepare() { - cd ${_pkgfqn} - - ln -s /usr/bin qttools/ - ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/ - - patch -d qtbase -p1 < "$srcdir"/8252ef5f.patch # Fix build with GCC 11 - patch -d qtbase -p1 < "$srcdir"/cb2da673.patch - patch -d qtwebengine -p1 < "$srcdir"/qt5-webengine-python3.patch # Fix build with Python 3 -} - -build() { - cd ${_pkgfqn} - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -headerdir /usr/include/qt \ - -archdatadir /usr/lib/qt \ - -datadir /usr/share/qt \ - -sysconfdir /etc/xdg \ - -nomake examples - make docs -} - -package_qt5-doc() { - pkgdesc='A cross-platform application and UI framework (Documentation)' - depends=('qt5-base') - - cd ${_pkgfqn} - make INSTALL_ROOT="$pkgdir" install_docs - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} -} - -package_qt5-examples() { - pkgdesc='Examples and demos from qt5 documentation' - depends=('qt5-doc') - - _base="$pkgdir"/usr/share/doc/qt/examples - - # The various example dirs have conflicting .pro files, but - # QtCreator requires them to be in the same top-level directory. - # Matching the Qt5 installer, only the qtbase project is kept. - mkdir -p $_base - cp ${_pkgfqn}/qtbase/examples/examples.pro $_base - - _fdirs=$(find "${_pkgfqn}" -maxdepth 2 -type d -name examples) - for _dir in $_fdirs; do - _mod=$(basename ${_dir%/examples}) - - if [ -e "$_dir/README" ]; then - cp $_dir/README $_dir/README.$_mod - fi - -# mkdir $_base/$_mod - cp -rn $_dir/* $_base - done -} Copied: qt5-doc/repos/extra-any/PKGBUILD (from rev 439887, qt5-doc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-03-17 21:39:23 UTC (rev 439888) @@ -0,0 +1,81 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> + +pkgbase=qt5-doc +pkgname=(qt5-doc qt5-examples) +pkgver=5.15.3 +pkgrel=1 +arch=('any') +url='https://www.qt.io' +license=('GPL3' 'LGPL3' 'FDL' 'custom') +makedepends=('qt5-tools' 'python' 'pciutils' 'libxtst' 'libxcursor' 'libxrandr' 'libxss' 'libxcomposite' + 'gperf' 'nss' 'clang' 'nodejs') +groups=('qt' 'qt5') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz" + qt5-webengine-python3.patch + no-qmake.patch) +sha256sums=('b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb' + '398c996cb5b606695ac93645143df39e23fa67e768b09e0da6dbd37342a43f32' + '7893df4981d6611c5aaeb4cc69bc77d14b4251842b205591a563f9a7184dfb0a') + +prepare() { + cd ${_pkgfqn/opensource-/} + + ln -s /usr/bin qttools/ + ln -s /usr/bin/{rcc,uic,moc,qmake} qtbase/bin/ + + patch -d qtbase -p1 < "$srcdir"/no-qmake.patch # Use system qmake + patch -d qtwebengine -p1 < "$srcdir"/qt5-webengine-python3.patch # Fix build with Python 3 +} + +build() { + cd ${_pkgfqn/opensource-/} + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -nomake examples + make docs +} + +package_qt5-doc() { + pkgdesc='A cross-platform application and UI framework (Documentation)' + depends=('qt5-base') + + cd ${_pkgfqn/opensource-/} + make INSTALL_ROOT="$pkgdir" install_docs + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} + +package_qt5-examples() { + pkgdesc='Examples and demos from qt5 documentation' + depends=('qt5-doc') + + _base="$pkgdir"/usr/share/doc/qt/examples + + # The various example dirs have conflicting .pro files, but + # QtCreator requires them to be in the same top-level directory. + # Matching the Qt5 installer, only the qtbase project is kept. + mkdir -p $_base + cp ${_pkgfqn/opensource-/}/qtbase/examples/examples.pro $_base + + _fdirs=$(find "${_pkgfqn/opensource-/}" -maxdepth 2 -type d -name examples) + for _dir in $_fdirs; do + _mod=$(basename ${_dir%/examples}) + + if [ -e "$_dir/README" ]; then + cp $_dir/README $_dir/README.$_mod + fi + +# mkdir $_base/$_mod + cp -rn $_dir/* $_base + done +} Copied: qt5-doc/repos/extra-any/no-qmake.patch (from rev 439887, qt5-doc/trunk/no-qmake.patch) =================================================================== --- no-qmake.patch (rev 0) +++ no-qmake.patch 2022-03-17 21:39:23 UTC (rev 439888) @@ -0,0 +1,110 @@ +diff --git a/configure b/configure +index b6c9b462f2..b426aa2085 100755 +--- a/configure ++++ b/configure +@@ -711,105 +711,6 @@ setBootstrapVariable() + getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" + } + +-# build qmake +- echo "Creating qmake..." +- mkdir -p "$outpath/qmake" || exit +- +- in_mkfile=$relpath/qmake/Makefile.unix +- mkfile=$outpath/qmake/Makefile +- if [ -f "$mkfile" ]; then +- [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile" +- rm -f "$mkfile" +- fi +- +- echo "########################################################################" > "$mkfile" +- echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile" +- echo "########################################################################" >> "$mkfile" +- EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)" +- EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)" +- +- [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= +- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" +- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" +- setBootstrapVariable QMAKE_CXXFLAGS +- setBootstrapVariable QMAKE_CXXFLAGS_CXX11 +- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS +- setBootstrapVariable QMAKE_LFLAGS +- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS +- +- if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then +- setBootstrapVariable QMAKE_CXXFLAGS_RELEASE +- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" +- else +- setBootstrapVariable QMAKE_CXXFLAGS_DEBUG +- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" +- fi +- +- adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` +- adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` +- adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'` +- +- echo "BUILD_PATH = .." >> "$mkfile" +- echo "SOURCE_PATH = $adjrelpath" >> "$mkfile" +- if [ -e "$relpath/.git" ]; then +- echo 'INC_PATH = $(BUILD_PATH)/include' >> "$mkfile" +- else +- echo 'INC_PATH = $(SOURCE_PATH)/include' >> "$mkfile" +- fi +- echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" +- echo "QT_VERSION = $QT_VERSION" >> "$mkfile" +- echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" +- echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" +- echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" +- echo "CONFIG_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" +- echo "CONFIG_LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" +- echo "RM_F = rm -f" >> "$mkfile" +- echo "RM_RF = rm -rf" >> "$mkfile" +- +- case `basename "$PLATFORM"` in +- win32-*g++*) +- cat "$in_mkfile.win32" >> "$mkfile" +- ;; +- *) +- cat "$in_mkfile.unix" >> "$mkfile" +- if [ "$BUILD_ON_MAC" = "yes" ]; then +- cat "$in_mkfile.macos" >> "$mkfile" +- fi +- ;; +- esac +- echo >>"$mkfile" +- +- if [ "$BUILD_ON_MAC" = "yes" ]; then +- echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile" +- cat "$in_mkfile" >> "$mkfile" +- echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile" +- else +- cat "$in_mkfile" >> "$mkfile" +- if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then +- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1 +- sed 's,^.*/\([^/]*.o\):,\1:,g' "$mkfile" >"$mkfile.tmp" +- sed "s,$outpath,$adjoutpath,g" "$mkfile.tmp" >"$mkfile" +- rm "$mkfile.tmp" +- fi +- fi +- +- if [ "$OPT_VERBOSE" = yes ]; then +- # Show the output of make +- (cd "$outpath/qmake"; "$MAKE") || exit 2 +- else +- # Hide the output of make +- # Use bash to print dots, if we have it, and stdout is a tty. +- if test -t 1 && $WHICH bash > /dev/null 2>/dev/null; then +- bash -c 'set -o pipefail +- cd "$0/qmake"; "$1" | while read line; do +- builtin echo -n . +- done' "$outpath" "$MAKE" || exit 2 +- else +- (cd "$outpath/qmake"; "$MAKE" -s) || exit 2 +- fi +- echo "Done." +- fi +- + #------------------------------------------------------------------------------- + # create a qt.conf for the Qt build tree itself + #------------------------------------------------------------------------------- Deleted: qt5-webengine-python3.patch =================================================================== --- qt5-webengine-python3.patch 2022-03-17 21:38:57 UTC (rev 439887) +++ qt5-webengine-python3.patch 2022-03-17 21:39:23 UTC (rev 439888) @@ -1,150 +0,0 @@ -diff --git a/configure.pri b/configure.pri -index e072961f..5efe30bc 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -12,10 +12,6 @@ defineTest(isPythonVersionSupported) { - python_version ~= s/[()]//g - python_version = $$split(python_version, ',') - python_major_version = $$first(python_version) -- greaterThan(python_major_version, 2) { -- qtLog("Python version 3 is not supported by Chromium.") -- return(false) -- } - python_minor_version = $$member(python_version, 1) - python_patch_version = $$member(python_version, 2) - greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true) -@@ -52,10 +48,10 @@ defineTest(qtConfReport_jumboBuild) { - qtConfReportPadded($${1}, $$mergeLimit) - } - --defineTest(qtConfTest_detectPython2) { -- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") -+defineTest(qtConfTest_detectPython) { -+ python = $$qtConfFindInPath("python$$EXE_SUFFIX") - isEmpty(python) { -- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") -+ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") - python = $$qtConfFindInPath("python$$EXE_SUFFIX") - } - isEmpty(python) { -@@ -63,11 +59,11 @@ defineTest(qtConfTest_detectPython2) { - return(false) - } - !isPythonVersionSupported($$python) { -- qtLog("A suitable Python 2 executable could not be located.") -+ qtLog("A suitable Python executable could not be located.") - return(false) - } - -- # Make tests.python2.location available in configure.json. -+ # Make tests.python.location available in configure.json. - $${1}.location = $$clean_path($$python) - export($${1}.location) - $${1}.cache += location -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 2750d707..9fda13d0 100644 ---- a/mkspecs/features/functions.prf -+++ b/mkspecs/features/functions.prf -@@ -39,11 +39,11 @@ defineReplace(which) { - - # Returns the unquoted path to the python executable. - defineReplace(pythonPath) { -- isEmpty(QMAKE_PYTHON2) { -+ isEmpty(QMAKE_PYTHON) { - # Fallback for building QtWebEngine with Qt < 5.8 -- QMAKE_PYTHON2 = python -+ QMAKE_PYTHON = python - } -- return($$QMAKE_PYTHON2) -+ return($$QMAKE_PYTHON) - } - - # Returns the python executable for use with shell / make targets. -diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index e7f869a1..1bf2c5d7 100644 ---- a/src/buildtools/config/support.pri -+++ b/src/buildtools/config/support.pri -@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { - !qtwebengine_checkForGperf(QtWebEngine):return(false) - !qtwebengine_checkForBison(QtWebEngine):return(false) - !qtwebengine_checkForFlex(QtWebEngine):return(false) -- !qtwebengine_checkForPython2(QtWebengine):return(false) -+ !qtwebengine_checkForPython(QtWebengine):return(false) - !qtwebengine_checkForSanitizer(QtWebEngine):return(false) - linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) - linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false) -@@ -50,7 +50,7 @@ defineReplace(qtwebengine_checkPdfError) { - !qtwebengine_checkForGperf(QtPdf):return(false) - !qtwebengine_checkForBison(QtPdf):return(false) - !qtwebengine_checkForFlex(QtPdf):return(false) -- !qtwebengine_checkForPython2(QtPdf):return(false) -+ !qtwebengine_checkForPython(QtPdf):return(false) - !qtwebengine_checkForSanitizer(QtPdf):return(false) - linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) - linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) -@@ -142,10 +142,10 @@ defineTest(qtwebengine_checkForFlex) { - return(true) - } - --defineTest(qtwebengine_checkForPython2) { -+defineTest(qtwebengine_checkForPython) { - module = $$1 -- !qtConfig(webengine-python2) { -- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") -+ !qtConfig(webengine-python) { -+ qtwebengine_skipBuild("Python is required to build $${module}.") - return(false) - } - return(true) -diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 88d1790c..032aa665 100644 ---- a/src/buildtools/configure.json -+++ b/src/buildtools/configure.json -@@ -294,9 +294,9 @@ - "label": "system ninja", - "type": "detectNinja" - }, -- "webengine-python2": { -- "label": "python2", -- "type": "detectPython2", -+ "webengine-python": { -+ "label": "python", -+ "type": "detectPython", - "log": "location" - }, - "webengine-winversion": { -@@ -372,7 +372,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) - && (!config.linux || features.webengine-host-pkg-config) -@@ -397,7 +397,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) - && (!config.linux || features.webengine-host-pkg-config) -@@ -420,12 +420,12 @@ - "autoDetect": "features.private_tests", - "output": [ "privateFeature" ] - }, -- "webengine-python2": { -- "label": "python2", -- "condition": "tests.webengine-python2", -+ "webengine-python": { -+ "label": "python", -+ "condition": "tests.webengine-python", - "output": [ - "privateFeature", -- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } -+ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } - ] - }, - "webengine-gperf": { Copied: qt5-doc/repos/extra-any/qt5-webengine-python3.patch (from rev 439887, qt5-doc/trunk/qt5-webengine-python3.patch) =================================================================== --- qt5-webengine-python3.patch (rev 0) +++ qt5-webengine-python3.patch 2022-03-17 21:39:23 UTC (rev 439888) @@ -0,0 +1,161 @@ +diff --git a/configure.pri b/configure.pri +index 8705ad93..6723bffe 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -7,20 +7,7 @@ QTWEBENGINE_SOURCE_TREE = $$PWD + equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe + + defineTest(isPythonVersionSupported) { +- python = $$system_quote($$system_path($$1)) +- python_version = $$system('$$python -c "import sys; print(sys.version_info[0:3])"') +- python_version ~= s/[()]//g +- python_version = $$split(python_version, ',') +- python_major_version = $$first(python_version) +- greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) +- } +- python_minor_version = $$member(python_version, 1) +- python_patch_version = $$member(python_version, 2) +- greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true) +- qtLog("Unsupported python version: $${python_major_version}.$${python_minor_version}.$${python_patch_version}.") +- return(false) ++ return(true) + } + + defineTest(qtConfTest_detectJumboBuild) { +@@ -52,10 +48,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +59,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": {