diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index c1cd7948b6..256ea52f01 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -11,22 +11,6 @@ QT_BEGIN_NAMESPACE -constexpr QPalette::ResolveMask QPalettePrivate::colorRoleOffset(QPalette::ColorGroup colorGroup) -{ - // Exclude NoRole; that bit is used for Accent - return (qToUnderlying(QPalette::NColorRoles) - 1) * qToUnderlying(colorGroup); -} - -constexpr QPalette::ResolveMask QPalettePrivate::bitPosition(QPalette::ColorGroup colorGroup, - QPalette::ColorRole colorRole) -{ - // Map Accent into NoRole for resolving purposes - if (colorRole == QPalette::Accent) - colorRole = QPalette::NoRole; - - return colorRole + colorRoleOffset(colorGroup); -} - static_assert(QPalettePrivate::bitPosition(QPalette::ColorGroup(QPalette::NColorGroups - 1), QPalette::ColorRole(QPalette::NColorRoles - 1)) < sizeof(QPalette::ResolveMask) * CHAR_BIT, diff --git a/src/gui/kernel/qpalette_p.h b/src/gui/kernel/qpalette_p.h index 6b24abf9a4..ce7c30d66d 100644 --- a/src/gui/kernel/qpalette_p.h +++ b/src/gui/kernel/qpalette_p.h @@ -48,9 +48,22 @@ public: : QPalettePrivate(QExplicitlySharedDataPointer(new Data)) { } - static constexpr QPalette::ResolveMask colorRoleOffset(QPalette::ColorGroup colorGroup); + static constexpr QPalette::ResolveMask colorRoleOffset(QPalette::ColorGroup colorGroup) + { + // Exclude NoRole; that bit is used for Accent + return (qToUnderlying(QPalette::NColorRoles) - 1) * qToUnderlying(colorGroup); + } + static constexpr QPalette::ResolveMask bitPosition(QPalette::ColorGroup colorGroup, - QPalette::ColorRole colorRole); + QPalette::ColorRole colorRole) + { + // Map Accent into NoRole for resolving purposes + if (colorRole == QPalette::Accent) + colorRole = QPalette::NoRole; + + return colorRole + colorRoleOffset(colorGroup); + } + QAtomicInt ref; QPalette::ResolveMask resolveMask = {0}; static inline int qt_palette_count = 0;