sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make FindPyQt5.py compatible with SIP v5

Browse Source
This commit is contained in:
Dmitry Shachnev 2020-07-21 21:49:46 +03:00
parent 426098bb86
commit 0506895753
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/FindPyQt5.py
View File

@ -30,15 +30,13 @@
# Redistribution and use is allowed according to the terms of the BSD license. # Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
import os.path
import PyQt5.QtCore import PyQt5.QtCore
try: try:
import PyQt5.pyqtconfig __import__('sipbuild')
pyqtcfg = PyQt5.pyqtconfig.Configuration()
except ImportError: except ImportError:
import sipconfig # won't work for SIP v5 import sipconfig # won't work for SIP v5
import os.path
import sys import sys
cfg = sipconfig.Configuration() cfg = sipconfig.Configuration()
@ -56,14 +54,18 @@ except ImportError:
else: else:
sys.exit(1) sys.exit(1)
cfg = { cfg = {
'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"), 'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
'pyqt_sip_dir': sip_dir, 'pyqt_sip_dir': sip_dir,
'pyqt_bin_dir': cfg.default_bin_dir, 'pyqt_bin_dir': cfg.default_bin_dir,
} }
pyqtcfg = sipconfig.Configuration([cfg]) else: # Code for SIP v5
from distutils.sysconfig import get_python_lib
import shutil
cfg = {
'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
'pyqt_sip_dir': os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings"),
'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
}
print("pyqt_version:%06.0x" % PyQt5.QtCore.PYQT_VERSION) print("pyqt_version:%06.0x" % PyQt5.QtCore.PYQT_VERSION)
print("pyqt_version_num:%d" % PyQt5.QtCore.PYQT_VERSION) print("pyqt_version_num:%d" % PyQt5.QtCore.PYQT_VERSION)
@ -82,10 +84,10 @@ for item in pyqt_config_list:
in_t = False in_t = False
print("pyqt_version_tag:%s" % pyqt_version_tag) print("pyqt_version_tag:%s" % pyqt_version_tag)
print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir) print("pyqt_mod_dir:%s" % cfg['pyqt_mod_dir'])
print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) print("pyqt_sip_dir:%s" % cfg['pyqt_sip_dir'])
print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags']) print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'])
print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir) print("pyqt_bin_dir:%s" % cfg['pyqt_bin_dir'])
try: try:
import PyQt5.sip import PyQt5.sip