Fix Qt5-Qt6 coinstall #273
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dfaure-kdab
requested changes
Jan 3, 2024
There was a problem hiding this comment.
Application code uses #include <KDSoapClient/KDSoapClientInterface> etc, please keep compatibility with that, e.g. using the approach I suggested in #262
redstrate
force-pushed
the
work/josh/fix-qt6-coinstallability
branch
from
fc38722 to
53fcc45
Compare
dfaure-kdab
approved these changes
Jan 3, 2024
This prevents collisions between Qt5 and Qt6 versions because the headers were installed to the same location. Qt5 keeps the "KDSoapClient"/"KDSoapServer" header location, but Qt6 is now installed inside a KDSoapX-Qt6 subdirectory. This allows existing client code to keep working. Fixes #262
redstrate
force-pushed
the
work/josh/fix-qt6-coinstallability
branch
from
976d384 to
cac5997
Compare
dfaure-kdab
approved these changes
Jan 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #262.
This moves Qt6 headers to KDSoapX-qt6, similar to how the rest of the Qt6 library is installed. This also fixes kdwsdl2cpp to point to the correct header (so qt6 will generate includes for -qt6 and Qt5 is still the plain header name.)