-
-
Notifications
You must be signed in to change notification settings - Fork 153
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
PR: Improve compatibility for QtWidgets
and QtGui
modules between Qt5 and Qt6 bindings
#410
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @StSav012 for the work here! It LGTM 👍
Also, I think it is okay to include this for 2.3.1, but just in case, what do you think @ccordoba12 and @CAM-Gerlach ?
QtWidgets
and QtGui
modules between Qt5 and Qt6 bindings
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, seems fine to me @dalthviz 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some stylistic suggestion, otherwise looks good to me.
Sure, I think that's fine because this is a small enough change. |
Thank you all. @ccordoba12 , I'll accept the changes as soon as I'll get to PC. Unfortunately, the changes don't provide full compatibility, for the modules have changed and are evolving. The change has its roots in mistakes I've made. Hopefully, others won't. |
I don't understand what you mean by this @StSav012. Are you talking about the changes you did in this PR? Or to my own suggestions? |
Oh, I'm sorry. I meant the PR. The reason I mentioned in the PR description is what I've stumbled upon. As for your corrections, I'll gladly accept them all when I reach my PC. Tomorrow night, probably. |
QtWidgets
and QtGui
modules between Qt5 and Qt6 bindingsQtWidgets
and QtGui
modules between Qt5 and Qt6 bindings
(N.B., any of us can apply them for you if you want). |
Yeah those are unrelated and will be fixed when #414 is merged, hopefully very soon, and then you can rebase on that: git fetch upstream
git switch moved-modules-in-qt6
git rebase upstream/master
git push --force-with-lease |
PR #414 is now merged! 🎉 |
fcc0ee0
to
5c6dd9c
Compare
I've gone ahead and used GItHub's built-in "Update Branch" button to update this. @StSav012 , if you need to pull the changes locally, you'll need to do: git fetch origin
git reset --hard origin/qtbindingsnotfounderror |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me now, thanks @StSav012!
Thank you all! I don't have much spare time these days. @CAM-Gerlach, I do appreciate that you've taken matters into your hands. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for all the work here @StSav012 !
Place
QAction
,QActionGroup
,QFileSystemModel
,QShortcut
, andQUndoCommand
both inQtGui
andQtWidgets
.The rationale. When developing under
PySide6
, one can importQAction
fromqtpy.QtGui
. When the code moved toPyQt5
, it fails.This is a part of the insanely large PR I recently proposed. This way, it would be easier to review the changes.
Fixes #389