Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build failure against PySide >= 6.8 #3395

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Conversation

karliss
Copy link
Member

@karliss karliss commented Nov 29, 2024

Your checklist for this pull request

Detailed description

Seems like some of the implementation details changed, removing the need for manual cleanup thus the function doesn't exist anymore. pyside/pyside-setup@33bd61d

Test plan (required)

  • Still compiles against Pyside < 6.8 - should be covered by CI tests, and the effective code should be identical to before
  • Compiles with Pyside 6.8 (need to use CUTTER_ENABLE_PYHON and CUTTER_ENABLE_PYTHON_BINDINGS) - tested on ArchLinux ✔️
  • With Pyside 6.8 Cutter exits cleanly without any crashes or new warning messages ✔️

Closing issues

closes #3384

@karliss karliss added Qt Issues and pull-requests regarding or caused-by the underlying Qt toolkit. Python labels Nov 29, 2024
Comment on lines +136 to +138
# if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
PySide::SignalManager::instance().clear();
# endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this clang-formatted ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's why the force push from 441a520 to 198541c. Initially had it without indentation, but Clang formatter in CI complained.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to say looks a bit weird especially without additional context.

Seems like in current config clang-format does 4 space indentation (in addition to #) for nested #if blocks. Not a problem for code that contains only preprocessor statements, not a problem if there is single level of #if combined with regular code. But second level of #if mixed with regular code results in the weird off by one indentation you see above.

@karliss karliss merged commit 93a06f5 into rizinorg:dev Nov 29, 2024
14 checks passed
@karliss karliss deleted the qt_68 branch November 29, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Python Qt Issues and pull-requests regarding or caused-by the underlying Qt toolkit.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure against PySide >= 6.8
3 participants