From 05bd97492704029647d442d0f83acb9e6436ed53 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sun, 30 Sep 2018 22:46:18 +0200 Subject: Compile python bindings with the same sip flags used by PyQt PyQt>=5.11 is compiled with the 'PyQt5.sip' sipname by default. This causes a sipname mismatch with KF5 bindings and prevents them from loading: To fix this, we compile KF5 bindings using the same sip flags (name and tags) that PyQt was compiled with. This ensures that we always use the correct sip name. We also stop setting the sip tags in FindPythonModuleGeneration.cmake to avoid duplication, and remove a (seemingly) unnecessary check for the Qt version that was forcing PyQt to be rebuilt for every patch Qt update. Differential Revision: https://phabricator.kde.org/D15091 --- find-modules/run-sip.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'find-modules/run-sip.py') diff --git a/find-modules/run-sip.py b/find-modules/run-sip.py index 74c84861..fc8a5e2b 100755 --- a/find-modules/run-sip.py +++ b/find-modules/run-sip.py @@ -6,6 +6,9 @@ import subprocess sipArgs = sys.argv[1:] +from PyQt5.Qt import PYQT_CONFIGURATION +sipArgs = PYQT_CONFIGURATION["sip_flags"].split(' ') + sipArgs + idx = sipArgs.index("--module-name") modname = sipArgs[idx + 1] del sipArgs[idx] -- cgit v1.2.1