FindPyQt5.py: Read version and SIP flags directly from PyQt5

And fix Qt version tag detection.
qgis · Jul 21, 2020 · 426098b · 426098b
1 parent e788412
commit 426098b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
@@ -30,12 +30,13 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+import PyQt5.QtCore
+
 try:
     import PyQt5.pyqtconfig
 
     pyqtcfg = PyQt5.pyqtconfig.Configuration()
 except ImportError:
-    import PyQt5.QtCore
     import sipconfig  # won't work for SIP v5
     import os.path
     import sys
@@ -64,25 +65,26 @@
     }
     pyqtcfg = sipconfig.Configuration([cfg])
 
-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
-print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
+print("pyqt_version:%06.0x" % PyQt5.QtCore.PYQT_VERSION)
+print("pyqt_version_num:%d" % PyQt5.QtCore.PYQT_VERSION)
+print("pyqt_version_str:%s" % PyQt5.QtCore.PYQT_VERSION_STR)
 
 pyqt_version_tag = ""
 in_t = False
-for item in pyqtcfg.pyqt_sip_flags.split(' '):
+pyqt_config_list = PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"].split(' ')
+for item in pyqt_config_list:
     if item == "-t":
         in_t = True
     elif in_t:
-        if item.startswith("Qt_4"):
+        if item.startswith("Qt_5"):
             pyqt_version_tag = item
     else:
         in_t = False
 print("pyqt_version_tag:%s" % pyqt_version_tag)
 
 print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir)
 print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir)
-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags)
+print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'])
 print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir)
 
 try: