[qt5] QMetaType fix for Qt5 #6570
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
capital-G
added
the
comp: Qt GUI
capital-G
approved these changes
Dec 17, 2024
There was a problem hiding this comment.
I think this is fine.
If this would be more permanent we could declare a new type alias via a global fix in a using for thiscompat.cpp.
But as all introduced changes are retrievable and revertable by searching for if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) it seems fine as is.
Thanks for taking care of this! Maybe wait a week for an additional review and if no one else gives this a review/remark we can merge this?
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.
Purpose and Motivation
In the process of reviewing #6521 it turned out that the issue in #6508 was already present with Qt 5.15 after adding f70364c. This PR brings back old behavior at the cost of four extra ifdefs in the codebase, reverting that change for Qt5. See discussion in #6521 (comment).
Thanks @xunil-cloud for the tip.
There might be a better way to address this issue, but I have no expertise to pursue that. I think the ifdef is a quick and easy fix, and will be removed when we remove Qt5 support altogether.
Fixes #6508 for Qt 5.15 (macOS legacy build).
Code that was previously failing for reference:
Types of changes
To-do list