use Variant alias types everywhere in place of QVariant#48320
Merged
Conversation
clintjedwards
approved these changes
Apr 9, 2026
This file contains hidden or 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
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.
This follows up on #48319 by updating the whole codebase to use the aliases. This PR includes the following changes:
Varianteverywhere instead ofQVariant.VariantHasheverywhere instead ofQVariantHash.VariantMapeverywhere instead ofQVariantMap.VariantListeverywhere instead ofQVariantList.#include <QVariant*>directives with#include "variant.h".qtcompat.h.Since the types are aliases to the Qt types, the code still actually uses the Qt types and compiles to the same thing, so there should be no change in behavior.
Note that even with these changes, call sites are not fully Qt-free. For example, the
QHashIteratortype is used to iterateVariantHash, and variant types are compared against enum values likeQMetaType::QVariantHash. These will be addressed later.