59 lines
2.2 KiB
Text
59 lines
2.2 KiB
Text
Index: configure.pri
|
|
--- configure.pri.orig
|
|
+++ 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 +39,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,7 +50,7 @@ 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)
|
|
}
|
|
|
|
@@ -113,6 +100,10 @@ defineTest(qtwebengine_platformError) {
|
|
|
|
defineTest(qtConfTest_detectPlatform) {
|
|
QT_FOR_CONFIG += gui-private
|
|
+
|
|
+ openbsd:qtwebengine_isLinuxPlatformSupported() {
|
|
+ $${1}.platform = "openbsd"
|
|
+ }
|
|
|
|
linux:qtwebengine_isLinuxPlatformSupported() {
|
|
$${1}.platform = "linux"
|