Further fixes for Qt6 #1713
Further fixes for Qt6 #1713
Conversation
Signed-off-by: Matthew J. Milner <[email protected]>
|
Here are the build results |
|
Here are the build results |
|
This pull request has been mentioned on Avogadro Discussion. There might be relevant details there: |
Signed-off-by: Matthew J. Milner <[email protected]>
|
Some minor gripes from |
avogadro/qtopengl/glwidget.h
Outdated
| #include <QOpenGLWidget> | ||
|
|
||
| #if QT_VERSION >= 0x060000 | ||
| #include <QtOpenGLWidgets/QOpenGLWidget> |
There was a problem hiding this comment.
That's weird - it shouldn't be necessary, but 🤷
| Avogadro::Rendering | ||
| Avogadro::QtOpenGL) | ||
|
|
||
| target_include_directories(BondCentric |
There was a problem hiding this comment.
There's got to be a better way to do this with cmake. In theory, this is set up through the function(avogadro_plugin bits in qtplugins/CMakeLists.txt.
I'd guess that's a better thing to modify so this isn't needed in a bunch of plugin CMakeLists.txt
There was a problem hiding this comment.
Yeah, I think all those things aren't needed now that I've fixed the issue with Avogadro::Rendering being PRIVATE.
That was a fix I did 6+ months ago so the exact errors these fixes were solving are a little lost to the depths of my memory.
Hence also them being all in a single commit, which I know isn't very helpful – it's cause I had to do a messy manual rebase on top of all the changes to master that had happened in the meantime
There was a problem hiding this comment.
Removed all the target_include_directories bits with the latest commit.
Signed-off-by: Matthew J. Milner <[email protected]>
Signed-off-by: Matthew J. Milner <[email protected]>
Thanks, incorporated |
|
This pull request has been mentioned on Avogadro Discussion. There might be relevant details there: https://discuss.avogadro.cc/t/september-2024-live-updates/5571/1 |
|
Here are the build results |
I believe I did get rid of them all in 497d54b. |
|
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.