From f26bf548768fd3e3e5d7540ce38fee500ed7a266 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 1 Jan 2023 10:31:13 +0100 Subject: [PATCH] PySide: in PySide6 QWebEnginePage has been moved to QtWebEngineCore --- cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake index 32158f65cc..65d7eeff58 100644 --- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake +++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake @@ -88,7 +88,12 @@ macro(SetupShibokenAndPyside) file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvg.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import *\n") file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtUiTools.py "from PySide${PYSIDE_MAJOR_VERSION}.QtUiTools import *\n") file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWidgets import *\n") - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n") + if(PYSIDE_MAJOR_VERSION LESS 6) + file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n") + else() + file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n" + "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEingineCore import QWebEnginePage\n") + endif() endif() if(APPLE AND NOT BUILD_WITH_CONDA) @@ -255,4 +260,4 @@ MACRO(PYSIDE_WRAP_RC outfiles) endif() list(APPEND ${outfiles} ${outfile}) ENDFOREACH(it) -ENDMACRO (PYSIDE_WRAP_RC) \ No newline at end of file +ENDMACRO (PYSIDE_WRAP_RC)