sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(cmake/FindPyQt6.py): remove acces to PyQt6.QtCore.PYQT_CONFIGURATION

Browse Source 
PYQT_CONFIGURATION is only available on PyQt5
This commit is contained in:
bdm-oslandia 2023-10-20 17:00:05 +02:00 committed by Julien Cabieces
parent 98b9b30d63
commit 9ff43c4f3c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindPyQt6.cmake
View File

@ -55,7 +55,7 @@ ELSE(EXISTS PYQT6_VERSION_STR)
IF(EXISTS ${PYQT6_SIP_DIR}/Qt6)
SET(PYQT6_SIP_DIR ${PYQT6_SIP_DIR}/Qt6)
ENDIF(EXISTS ${PYQT6_SIP_DIR}/Qt6)
STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT6_SIP_FLAGS ${pyqt_config})
SET(PYQT6_SIP_FLAGS "")
STRING(REGEX REPLACE ".*\npyqt_bin_dir:([^\n]+).*$" "\\1" PYQT6_BIN_DIR ${pyqt_config})
STRING(REGEX REPLACE ".*\npyqt_sip_module:([^\n]+).*$" "\\1" PYQT6_SIP_IMPORT ${pyqt_config})
SET(PYQT6_FOUND TRUE)

1
cmake/FindPyQt6.py
View File

@ -48,7 +48,6 @@ for p in (os.path.join(sip_dir, "PyQt6"),
print("pyqt_version_str:%s" % PyQt6.QtCore.PYQT_VERSION_STR)
print("pyqt_mod_dir:%s" % os.path.join(cfg.default_mod_dir, "PyQt6"))
print("pyqt_sip_dir:%s" % sip_dir)
print("pyqt_sip_flags:%s" % PyQt6.QtCore.PYQT_CONFIGURATION['sip_flags'])
print("pyqt_bin_dir:%s" % cfg.default_bin_dir)
try: