Some preparations for KDE6/QT6 #240
Conversation
|
Thanks a lot, that is very appreciated. FYI, my plan is as follows: I am currently working on the (already way to big) branch newshared for Kraft 2.0 as described in the discussion. Once that is mergeable, it will be merged to master. Than, the port to Qt6 can happen on master easily. The stable 1.x version will be maintained in a branch after that. |
|
Would you mind rebasing this one to see if the actions run through? Thanks! |
The old names have been deprecated in KDE5 and are removed in KDE6.
The definitions are already propagated as necessary by the targets. There is no need to duplicate them.
This variable is a leftover from QT4, it is not set anymore.
The same logic is already part of the corresponding header file.
The CMake targets already set up the include path properly. Use them instead of adding custom global include directories.
These global include directories are nearly unused. Replace them with a dedicated include directory for the single user.
|
It didn't work. But it should be fixable in a reasonable manner. |
t-8ch
force-pushed
the
kde6
branch
3 times, most recently
from
b1d1691 to
3548b15
Compare
CMake can automatically compile resources when added to a targets sources. This avoids a call to a qt5 specific API which would not work on qt6. Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
t-8ch
force-pushed
the
kde6
branch
2 times, most recently
from
5ce2903 to
a8af906
Compare
|
That seems to have worked. I dropped the breaking commit, and will see what is the issue. |
|
@t-8ch the branch https://github.com/dragotin/kraft/tree/portqt6_1 now builds against qt6 and also works with KF6. That makes this particular PR a bit redundant, but would you mind double checking the cmake files in the branch if you have a minute? Thanks a lot. |
|
@dragotin Looks good in general. Testing seems to be broken when building out of tree. |
|
Drop |
These are some cleanups I encountered when trying to build for KDE6/QT6.
Most of them are already applicable today.
Feel free to pick up single commits now, or incorporate them into your migration work.