Disallow importing conflicting version of PyQt

If a different version of PyQt was found, its containing folder would be removed from sys.path, removing neighboring modules. Normally this wouldn't be much of a problem, but it could be that this is a distro build where we need system PyQt that happens to be installed next to another version of PyQt.

So this fixes it to re-add the neighboring modules.

This replaces the sys.path modification with a better hack that overrides builtins.import to raise a ModuleNotFoundError if an attempt is made to load the wrong PyQt.

It also makes sure to show a proper error message if PyQt6 wasn't found rather than claiming it was looking for Qt5 bindings.

This is an attempt to fix

BUG:518163

Test Plan

Run Krita and check that plugins work?

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.
  • Does the patch add a user-visible feature? If yes, is there a documentation MR ready for it at Krita Documentation Repository?

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Edited by Freya Lupen

Merge request reports

Loading