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.

Sign up for GitHub

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

Jump to bottom

Fix build failure against PySide >= 6.8 #3395

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Fix build failure against PySide >= 6.8 #3395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/common/PythonManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ void PythonManager::shutdown()
Core()->setProperty("_PySideInvalidatePtr", QVariant());

// see PySide::destroyQCoreApplication()
# if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
PySide::SignalManager::instance().clear();
# endif
Comment on lines +136 to +138
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.

Shiboken::BindingManager &bm = Shiboken::BindingManager::instance();
SbkObject *pyQApp = bm.retrieveWrapper(QCoreApplication::instance());
PyTypeObject *pyQObjectType = Shiboken::Conversions::getPythonTypeObject("QObject*");
Expand Down
Loading