-
-
Notifications
You must be signed in to change notification settings - Fork 334
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
QT6 migration #386
QT6 migration #386
Conversation
753c229
to
8f23a9e
Compare
@nuttyartist @bjorn PR is complete & commits are squashed. The code needs to be reviewed and the build needs to be tested on macOS & Windows. |
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.
I've left a few comments.
So, will we have one codebase for both Qt6 and Qt5? |
In my opinion, that would be best. The changes between Qt 5 and 6 are not that large, judging by the relatively small amount of work I've had to do for this PR. |
I squashed commits & addressed the code review comments, now only needs to be tested on macOS and Windows. |
I fixed a problem with the windows build (this means we need a windows qt6 build check before we merge). I also noticed that on both Windows and Linux, resizing works strangely. Whenever I start to resize, the left pane grows incredibly large, causing the middle and right panes to shrink down a lot. This happens on both Qt 5.15 and 6.4. Doesn't happen on Notes v2.0.0. Will investigate. |
Watching your updates. Let me know when you want me to test it. |
Not sure why, but the appveyor build fails because it can't find |
I have added initial support for Qt 6 builds on GitHub Actions on my local qt6 branch (it's syncd with this PR's branch). Right now, only the Qt 6 build of Windows is failing: https://github.com/guihkx/notes/actions/runs/3304734012 Feel free to incorporate my commits on this PR for your tests. |
Should we drop Appveyor in favor of GitHub Actions? We already do in Actions whatever we are doing in Appveyor right? |
Yes, but I think we should also include 5.9 builds in windows.yml. @nuttyartist Could you take a look at the latest windows qt6 build that fails? This is the error in framelesswindow.cpp (line 275): |
I suppose we can do that, yes.
Hmm, is that really necessary, though? Aren't we only supporting 5.9 because of Ubuntu 18.08? 🤔 |
Ah, of course. Is there no Windows version still using 5.9? |
As far as I know, the only way to install Qt on Windows is through the official installer provided by Qt (or via aqtinstall, but I'm not sure if that's a common thing to do). So, different from Ubuntu (and Linux distros in general), on Windows it's very easy to upgrade to the latest Qt release. |
FWIW, you can also remove |
Yes, you can remove it. |
@nuttyartist The appveyor build still runs for some reason. I guess you need to remove some kind of appveyor webhook? This PR is now ready for testing. |
Yes, I removed the webhook. Great, I'll test it soon. |
Works well on macOS, compiles on QT6.4 and Qt5.15.2. 👍 |
Works well on Windows as well 👍 @bjorn Any comments before I merge? |
Merging... @zjeffer Thank you so much! Great work. |
Will fix #356.
TODO
QT_VERSION_CHECK
snotes
on all platforms