-
-
Notifications
You must be signed in to change notification settings - Fork 171
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
QRegExp ports, compile plugins on Qt6, remove Qt6Core5Compat dependency #1748
Conversation
Signed-off-by: Geoff Hutchison <[email protected]>
Signed-off-by: Geoff Hutchison <[email protected]>
Signed-off-by: Geoff Hutchison <[email protected]>
Signed-off-by: Geoff Hutchison <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
… identical functions in qtgui/interfacescript Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Combined with your work on it, this means everything in The ports I've made are a bit of a mixed bag; some I just did the minimal changes to make it work but with the same strategies, even if there are easier or more idiomatic ways to do it with So I'd very much appreciate you looking over what I've done to check it matches the old code in outcome. What I can say is that everything in this PR compiles against Qt5 successfully (though with |
Clearly I should have merged my work -- at least on the qt6 fixes. In principle, I'll do a real review in a bit, but it looks like a great start towards qt6, thanks! |
Here are the build results |
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
…MultiMap Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
With my commits today, all instances of Various qtplugins ( Most of those were excluded because of the
The only things still being excluded are thus The On my machine both Qt6 and Qt5 builds succeed, in conjunction with the corresponding pull requests to |
This pull request has been mentioned on Avogadro Discussion. There might be relevant details there: |
Here are the build results |
Thanks, this is obviously a great step forward if we can adopt Qt6. There are some errors still because the I'll look into the errors on Windows. |
Here are the build results |
…rted Signed-off-by: Matthew J. Milner <[email protected]>
See if this helps with getting the tests to pass. |
I'm going to merge -- looks good so far. |
Next time, can we break into smaller pull requests so we don't have identical commits on different branches (e.g., the AppImage changes)? That would be a big help -- although I realize the qt6 changes were kinda a pain. |
Absolutely, though most of this ended up being pretty tied together. Do you ever do squash merge commits? Or is this less about the number of commits and more about the number of changes? |
I sometimes do squash commits - but I couldn't do that in this case, because you pulled some of my commits on the molecular properties dialog, plus the AppImage changes. The number of changes isn't so much the issue - I probably should have merged the initial work on the MolProp dialog since I knew you were working on qt6 fixes. The challenge is when there are commits from different branches in one pull request. So it's usually easier to have smaller self-contained PR to merge. Not a big deal though. |
Here are the build results |
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.