diff options
Diffstat (limited to 'src/gui/kernel/qguivariant.cpp')
-rw-r--r-- | src/gui/kernel/qguivariant.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 656072c0bf..78a1660355 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -50,14 +50,14 @@ #include <float.h> -#include "private/qvariant_p.h" #include <private/qmetatype_p.h> QT_BEGIN_NAMESPACE namespace { -static const struct : QMetaTypeModuleHelper +// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class +static constexpr struct : QMetaTypeModuleHelper { #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \ QT_METATYPE_INTERFACE_INIT(RealName), @@ -78,7 +78,9 @@ static const struct : QMetaTypeModuleHelper // either two nullptrs from canConvert, or two valid pointers Q_ASSERT(onlyCheck || (bool(from) && bool(to))); +#if QT_CONFIG(shortcut) using Int = int; +#endif switch (makePair(toTypeId, fromTypeId)) { QMETATYPE_CONVERTER(QByteArray, QColor, result = source.name(source.alpha() != 255 ? |