1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename confusingly named QFont/QPalette::resolve overloads

Browse Source 
Having three methods with the same name doing different things is
unnecessarily confusing, so follow the standard naming convention in
Qt and call the getter of the resolve mask resolveMask, and the setter
setResolveMask. These methods were all documented as internal.

The publicly documented resolve() method that merges two fonts and
palettes based on the respective masks remains as it is, even though
'merge' would perhaps be a better name.

Change-Id: If90b1ad800834baccd1dbc38fc6b861540d6df6e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-08-19 11:52:07 +02:00
parent c0d0949448
commit b77a3f47c9
25 changed files with 140 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/kernel/qguiapplication.cpp
View File

@ -3368,10 +3368,10 @@ bool QGuiApplicationPrivate::setPalette(const QPalette &palette)
// Resolve the palette against the theme palette, filling in // Resolve the palette against the theme palette, filling in
// any missing roles, while keeping the original resolve mask. // any missing roles, while keeping the original resolve mask.
QPalette basePalette = qGuiApp ? qGuiApp->d_func()->basePalette() : Qt::gray; QPalette basePalette = qGuiApp ? qGuiApp->d_func()->basePalette() : Qt::gray;
basePalette.resolve(0); // The base palette only contributes missing colors roles basePalette.setResolveMask(0); // The base palette only contributes missing colors roles
QPalette resolvedPalette = palette.resolve(basePalette); QPalette resolvedPalette = palette.resolve(basePalette);
if (app_pal && resolvedPalette == *app_pal && resolvedPalette.resolve() == app_pal->resolve()) if (app_pal && resolvedPalette == *app_pal && resolvedPalette.resolveMask() == app_pal->resolveMask())
return false; return false;
if (!app_pal) if (!app_pal)
@ -3379,7 +3379,7 @@ bool QGuiApplicationPrivate::setPalette(const QPalette &palette)
else else
*app_pal = resolvedPalette; *app_pal = resolvedPalette;
QCoreApplication::setAttribute(Qt::AA_SetPalette, app_pal->resolve() != 0); QCoreApplication::setAttribute(Qt::AA_SetPalette, app_pal->resolveMask() != 0);
return true; return true;
} }

18
src/gui/kernel/qpalette.cpp
View File

@ -961,20 +961,22 @@ QPalette QPalette::resolve(const QPalette &other) const
} }
/*! /*!
\fn uint QPalette::resolve() const \fn QPalette::ResolveMask QPalette::resolveMask() const
\internal \internal
*/ */
/*! /*!
\typedef ResolveMaskType \typedef ResolveMask
\internal
*/
/*!
\fn void QPalette::resolve(ResolveMaskType mask)
\internal \internal
*/ */
/*!
\fn void QPalette::setResolveMask(ResolveMask)
\internal
A bit mask that stores which colors the palette instance explicitly defines,
and which ones are inherited from a parent.
*/
/***************************************************************************** /*****************************************************************************
QPalette stream functions QPalette stream functions
@ -1250,7 +1252,7 @@ QDebug operator<<(QDebug dbg, const QPalette &p)
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
dbg.nospace(); dbg.nospace();
dbg << "QPalette(resolve=" << Qt::hex << Qt::showbase << p.resolve(); dbg << "QPalette(resolve=" << Qt::hex << Qt::showbase << p.resolveMask();
auto roleString = rolesToString(p); auto roleString = rolesToString(p);
if (!roleString.isEmpty()) if (!roleString.isEmpty())

4
src/gui/kernel/qpalette.h
View File

@ -157,8 +157,8 @@ public:
QPalette resolve(const QPalette &other) const; QPalette resolve(const QPalette &other) const;
using ResolveMask = quint64; using ResolveMask = quint64;
inline ResolveMask resolve() const { return data.resolveMask; } inline ResolveMask resolveMask() const { return data.resolveMask; }
inline void resolve(ResolveMask mask) { data.resolveMask = mask; } inline void setResolveMask(ResolveMask mask) { data.resolveMask = mask; }
private: private:
void setColorGroup(ColorGroup cr, const QBrush &windowText, const QBrush &button, void setColorGroup(ColorGroup cr, const QBrush &windowText, const QBrush &button,

4
src/gui/text/qfont.cpp
View File

@ -1761,12 +1761,12 @@ QFont QFont::resolve(const QFont &other) const
} }
/*! /*!
\fn uint QFont::resolve() const \fn uint QFont::resolveMask() const
\internal \internal
*/ */
/*! /*!
\fn void QFont::resolve(uint mask) \fn void QFont::setResolveMask(uint mask)
\internal \internal
*/ */

4
src/gui/text/qfont.h
View File

@ -275,8 +275,8 @@ public:
QString defaultFamily() const; QString defaultFamily() const;
QFont resolve(const QFont &) const; QFont resolve(const QFont &) const;
inline uint resolve() const { return resolve_mask; } inline uint resolveMask() const { return resolve_mask; }
inline void resolve(uint mask) { resolve_mask = mask; } inline void setResolveMask(uint mask) { resolve_mask = mask; }
private: private:
explicit QFont(QFontPrivate *); explicit QFont(QFontPrivate *);

6
src/gui/text/qtextformat.cpp
View File

@ -324,7 +324,7 @@ size_t QTextFormatPrivate::recalcHash() const
void QTextFormatPrivate::resolveFont(const QFont &defaultFont) void QTextFormatPrivate::resolveFont(const QFont &defaultFont)
{ {
recalcFont(); recalcFont();
const uint oldMask = fnt.resolve(); const uint oldMask = fnt.resolveMask();
fnt = fnt.resolve(defaultFont); fnt = fnt.resolve(defaultFont);
if (hasProperty(QTextFormat::FontSizeAdjustment)) { if (hasProperty(QTextFormat::FontSizeAdjustment)) {
@ -342,7 +342,7 @@ void QTextFormatPrivate::resolveFont(const QFont &defaultFont)
} }
} }
fnt.resolve(oldMask); fnt.setResolveMask(oldMask);
} }
void QTextFormatPrivate::recalcFont() const void QTextFormatPrivate::recalcFont() const
@ -1971,7 +1971,7 @@ QStringList QTextCharFormat::anchorNames() const
void QTextCharFormat::setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior) void QTextCharFormat::setFont(const QFont &font, FontPropertiesInheritanceBehavior behavior)
{ {
const uint mask = behavior == FontPropertiesAll ? uint(QFont::AllPropertiesResolved) const uint mask = behavior == FontPropertiesAll ? uint(QFont::AllPropertiesResolved)
: font.resolve(); : font.resolveMask();
if (mask & QFont::FamilyResolved) if (mask & QFont::FamilyResolved)
setFontFamily(font.family()); setFontFamily(font.family());

2
src/plugins/platforms/cocoa/qcocoamenu.mm
View File

@ -93,7 +93,7 @@ void QCocoaMenu::setMinimumWidth(int width)
void QCocoaMenu::setFont(const QFont &font) void QCocoaMenu::setFont(const QFont &font)
{ {
if (font.resolve()) { if (font.resolveMask()) {
NSFont *customMenuFont = [NSFont fontWithName:font.family().toNSString() NSFont *customMenuFont = [NSFont fontWithName:font.family().toNSString()
size:font.pointSize()]; size:font.pointSize()];
m_nativeMenu.font = customMenuFont; m_nativeMenu.font = customMenuFont;

4
src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
View File

@ -370,14 +370,14 @@ bool QWindowsXPStylePrivate::isItemViewDelegateLineEdit(const QWidget *widget)
// Returns whether base color is set for this widget // Returns whether base color is set for this widget
bool QWindowsXPStylePrivate::isLineEditBaseColorSet(const QStyleOption *option, const QWidget *widget) bool QWindowsXPStylePrivate::isLineEditBaseColorSet(const QStyleOption *option, const QWidget *widget)
{ {
uint resolveMask = option->palette.resolve(); uint resolveMask = option->palette.resolveMask();
if (widget) { if (widget) {
// Since spin box includes a line edit we need to resolve the palette mask also from // Since spin box includes a line edit we need to resolve the palette mask also from
// the parent, as while the color is always correct on the palette supplied by panel, // the parent, as while the color is always correct on the palette supplied by panel,
// the mask can still be empty. If either mask specifies custom base color, use that. // the mask can still be empty. If either mask specifies custom base color, use that.
#if QT_CONFIG(spinbox) #if QT_CONFIG(spinbox)
if (const QAbstractSpinBox *spinbox = qobject_cast<QAbstractSpinBox*>(widget->parentWidget())) if (const QAbstractSpinBox *spinbox = qobject_cast<QAbstractSpinBox*>(widget->parentWidget()))
resolveMask |= spinbox->palette().resolve(); resolveMask |= spinbox->palette().resolveMask();
#endif // QT_CONFIG(spinbox) #endif // QT_CONFIG(spinbox)
} }
return (resolveMask & (1 << QPalette::Base)) != 0; return (resolveMask & (1 << QPalette::Base)) != 0;

4
src/widgets/graphicsview/qgraphicsproxywidget.cpp
View File

@ -843,7 +843,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
case QEvent::FontChange: { case QEvent::FontChange: {
// Propagate to widget. // Propagate to widget.
QWidgetPrivate *wd = d->widget->d_func(); QWidgetPrivate *wd = d->widget->d_func();
int mask = d->font.resolve() | d->inheritedFontResolveMask; int mask = d->font.resolveMask() | d->inheritedFontResolveMask;
wd->inheritedFontResolveMask = mask; wd->inheritedFontResolveMask = mask;
wd->resolveFont(); wd->resolveFont();
break; break;
@ -851,7 +851,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
case QEvent::PaletteChange: { case QEvent::PaletteChange: {
// Propagate to widget. // Propagate to widget.
QWidgetPrivate *wd = d->widget->d_func(); QWidgetPrivate *wd = d->widget->d_func();
int mask = d->palette.resolve() | d->inheritedPaletteResolveMask; int mask = d->palette.resolveMask() | d->inheritedPaletteResolveMask;
wd->inheritedPaletteResolveMask = mask; wd->inheritedPaletteResolveMask = mask;
wd->resolvePalette(); wd->resolvePalette();
break; break;

20
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -1532,7 +1532,7 @@ void QGraphicsScenePrivate::ensureSequentialTopLevelSiblingIndexes()
*/ */
void QGraphicsScenePrivate::setFont_helper(const QFont &font) void QGraphicsScenePrivate::setFont_helper(const QFont &font)
{ {
if (this->font == font && this->font.resolve() == font.resolve()) if (this->font == font && this->font.resolveMask() == font.resolveMask())
return; return;
updateFont(font); updateFont(font);
} }
@ -1546,7 +1546,7 @@ void QGraphicsScenePrivate::setFont_helper(const QFont &font)
void QGraphicsScenePrivate::resolveFont() void QGraphicsScenePrivate::resolveFont()
{ {
QFont naturalFont = QApplication::font(); QFont naturalFont = QApplication::font();
naturalFont.resolve(0); naturalFont.setResolveMask(0);
QFont resolvedFont = font.resolve(naturalFont); QFont resolvedFont = font.resolve(naturalFont);
updateFont(resolvedFont); updateFont(resolvedFont);
} }
@ -1572,7 +1572,7 @@ void QGraphicsScenePrivate::updateFont(const QFont &font)
// Resolvefont for an item is a noop operation, but // Resolvefont for an item is a noop operation, but
// every item can be a widget, or can have a widget // every item can be a widget, or can have a widget
// childre. // childre.
item->d_ptr->resolveFont(font.resolve()); item->d_ptr->resolveFont(font.resolveMask());
} }
} }
@ -1589,7 +1589,7 @@ void QGraphicsScenePrivate::updateFont(const QFont &font)
*/ */
void QGraphicsScenePrivate::setPalette_helper(const QPalette &palette) void QGraphicsScenePrivate::setPalette_helper(const QPalette &palette)
{ {
if (this->palette == palette && this->palette.resolve() == palette.resolve()) if (this->palette == palette && this->palette.resolveMask() == palette.resolveMask())
return; return;
updatePalette(palette); updatePalette(palette);
} }
@ -1603,7 +1603,7 @@ void QGraphicsScenePrivate::setPalette_helper(const QPalette &palette)
void QGraphicsScenePrivate::resolvePalette() void QGraphicsScenePrivate::resolvePalette()
{ {
QPalette naturalPalette = QGuiApplication::palette(); QPalette naturalPalette = QGuiApplication::palette();
naturalPalette.resolve(0); naturalPalette.setResolveMask(0);
QPalette resolvedPalette = palette.resolve(naturalPalette); QPalette resolvedPalette = palette.resolve(naturalPalette);
updatePalette(resolvedPalette); updatePalette(resolvedPalette);
} }
@ -1629,7 +1629,7 @@ void QGraphicsScenePrivate::updatePalette(const QPalette &palette)
// ResolvePalette for an item is a noop operation, but // ResolvePalette for an item is a noop operation, but
// every item can be a widget, or can have a widget // every item can be a widget, or can have a widget
// children. // children.
item->d_ptr->resolvePalette(palette.resolve()); item->d_ptr->resolvePalette(palette.resolveMask());
} }
} }
@ -2548,8 +2548,8 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
addItem(child); addItem(child);
// Resolve font and palette. // Resolve font and palette.
item->d_ptr->resolveFont(d->font.resolve()); item->d_ptr->resolveFont(d->font.resolveMask());
item->d_ptr->resolvePalette(d->palette.resolve()); item->d_ptr->resolvePalette(d->palette.resolveMask());
// Reenable selectionChanged() for individual items // Reenable selectionChanged() for individual items
@ -5562,7 +5562,7 @@ void QGraphicsScene::setFont(const QFont &font)
{ {
Q_D(QGraphicsScene); Q_D(QGraphicsScene);
QFont naturalFont = QApplication::font(); QFont naturalFont = QApplication::font();
naturalFont.resolve(0); naturalFont.setResolveMask(0);
QFont resolvedFont = font.resolve(naturalFont); QFont resolvedFont = font.resolve(naturalFont);
d->setFont_helper(resolvedFont); d->setFont_helper(resolvedFont);
} }
@ -5599,7 +5599,7 @@ void QGraphicsScene::setPalette(const QPalette &palette)
{ {
Q_D(QGraphicsScene); Q_D(QGraphicsScene);
QPalette naturalPalette = QGuiApplication::palette(); QPalette naturalPalette = QGuiApplication::palette();
naturalPalette.resolve(0); naturalPalette.setResolveMask(0);
QPalette resolvedPalette = palette.resolve(naturalPalette); QPalette resolvedPalette = palette.resolve(naturalPalette);
d->setPalette_helper(resolvedPalette); d->setPalette_helper(resolvedPalette);
} }

6
src/widgets/graphicsview/qgraphicswidget.cpp
View File

@ -977,13 +977,13 @@ QFont QGraphicsWidget::font() const
{ {
Q_D(const QGraphicsWidget); Q_D(const QGraphicsWidget);
QFont fnt = d->font; QFont fnt = d->font;
fnt.resolve(fnt.resolve() | d->inheritedFontResolveMask); fnt.setResolveMask(fnt.resolveMask() | d->inheritedFontResolveMask);
return fnt; return fnt;
} }
void QGraphicsWidget::setFont(const QFont &font) void QGraphicsWidget::setFont(const QFont &font)
{ {
Q_D(QGraphicsWidget); Q_D(QGraphicsWidget);
setAttribute(Qt::WA_SetFont, font.resolve() != 0); setAttribute(Qt::WA_SetFont, font.resolveMask() != 0);
QFont naturalFont = d->naturalWidgetFont(); QFont naturalFont = d->naturalWidgetFont();
QFont resolvedFont = font.resolve(naturalFont); QFont resolvedFont = font.resolve(naturalFont);
@ -1023,7 +1023,7 @@ QPalette QGraphicsWidget::palette() const
void QGraphicsWidget::setPalette(const QPalette &palette) void QGraphicsWidget::setPalette(const QPalette &palette)
{ {
Q_D(QGraphicsWidget); Q_D(QGraphicsWidget);
setAttribute(Qt::WA_SetPalette, palette.resolve() != 0); setAttribute(Qt::WA_SetPalette, palette.resolveMask() != 0);
QPalette naturalPalette = d->naturalWidgetPalette(); QPalette naturalPalette = d->naturalWidgetPalette();
QPalette resolvedPalette = palette.resolve(naturalPalette); QPalette resolvedPalette = palette.resolve(naturalPalette);

12
src/widgets/graphicsview/qgraphicswidget_p.cpp
View File

@ -150,7 +150,7 @@ void QGraphicsWidgetPrivate::ensureWindowData()
void QGraphicsWidgetPrivate::setPalette_helper(const QPalette &palette) void QGraphicsWidgetPrivate::setPalette_helper(const QPalette &palette)
{ {
if (this->palette == palette && this->palette.resolve() == palette.resolve()) if (this->palette == palette && this->palette.resolveMask() == palette.resolveMask())
return; return;
updatePalette(palette); updatePalette(palette);
} }
@ -172,7 +172,7 @@ void QGraphicsWidgetPrivate::updatePalette(const QPalette &palette)
// Calculate new mask. // Calculate new mask.
if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation))
inheritedPaletteResolveMask = 0; inheritedPaletteResolveMask = 0;
int mask = palette.resolve() | inheritedPaletteResolveMask; int mask = palette.resolveMask() | inheritedPaletteResolveMask;
// Propagate to children. // Propagate to children.
for (int i = 0; i < children.size(); ++i) { for (int i = 0; i < children.size(); ++i) {
@ -239,13 +239,13 @@ QPalette QGraphicsWidgetPrivate::naturalWidgetPalette() const
} else if (scene) { } else if (scene) {
palette = scene->palette(); palette = scene->palette();
} }
palette.resolve(0); palette.setResolveMask(0);
return palette; return palette;
} }
void QGraphicsWidgetPrivate::setFont_helper(const QFont &font) void QGraphicsWidgetPrivate::setFont_helper(const QFont &font)
{ {
if (this->font == font && this->font.resolve() == font.resolve()) if (this->font == font && this->font.resolveMask() == font.resolveMask())
return; return;
updateFont(font); updateFont(font);
} }
@ -270,7 +270,7 @@ void QGraphicsWidgetPrivate::updateFont(const QFont &font)
// Calculate new mask. // Calculate new mask.
if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation))
inheritedFontResolveMask = 0; inheritedFontResolveMask = 0;
int mask = font.resolve() | inheritedFontResolveMask; int mask = font.resolveMask() | inheritedFontResolveMask;
// Propagate to children. // Propagate to children.
for (int i = 0; i < children.size(); ++i) { for (int i = 0; i < children.size(); ++i) {
@ -300,7 +300,7 @@ QFont QGraphicsWidgetPrivate::naturalWidgetFont() const
} else if (scene) { } else if (scene) {
naturalFont = scene->font(); naturalFont = scene->font();
} }
naturalFont.resolve(0); naturalFont.setResolveMask(0);
return naturalFont; return naturalFont;
} }

4
src/widgets/kernel/qapplication.cpp
View File

@ -1185,9 +1185,9 @@ void QApplication::setPalette(const QPalette &palette, const char* className)
if (className) { if (className) {
QPalette polishedPalette = palette; QPalette polishedPalette = palette;
if (QApplicationPrivate::app_style) { if (QApplicationPrivate::app_style) {
auto originalResolveMask = palette.resolve(); auto originalResolveMask = palette.resolveMask();
QApplicationPrivate::app_style->polish(polishedPalette); QApplicationPrivate::app_style->polish(polishedPalette);
polishedPalette.resolve(originalResolveMask); polishedPalette.setResolveMask(originalResolveMask);
} }
QApplicationPrivate::widgetPalettes.insert(className, polishedPalette); QApplicationPrivate::widgetPalettes.insert(className, polishedPalette);

32
src/widgets/kernel/qwidget.cpp
View File

@ -1831,14 +1831,14 @@ void QWidgetPrivate::propagatePaletteChange()
#if QT_CONFIG(graphicsview) #if QT_CONFIG(graphicsview)
if (!q->parentWidget() && extra && extra->proxyWidget) { if (!q->parentWidget() && extra && extra->proxyWidget) {
QGraphicsProxyWidget *p = extra->proxyWidget; QGraphicsProxyWidget *p = extra->proxyWidget;
inheritedPaletteResolveMask = p->d_func()->inheritedPaletteResolveMask | p->palette().resolve(); inheritedPaletteResolveMask = p->d_func()->inheritedPaletteResolveMask | p->palette().resolveMask();
} else } else
#endif // QT_CONFIG(graphicsview) #endif // QT_CONFIG(graphicsview)
if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) { if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) {
inheritedPaletteResolveMask = 0; inheritedPaletteResolveMask = 0;
} }
directPaletteResolveMask = data.pal.resolve(); directPaletteResolveMask = data.pal.resolveMask();
auto mask = directPaletteResolveMask | inheritedPaletteResolveMask; auto mask = directPaletteResolveMask | inheritedPaletteResolveMask;
const bool useStyleSheetPropagationInWidgetStyles = const bool useStyleSheetPropagationInWidgetStyles =
@ -4376,7 +4376,7 @@ const QPalette &QWidget::palette() const
void QWidget::setPalette(const QPalette &palette) void QWidget::setPalette(const QPalette &palette)
{ {
Q_D(QWidget); Q_D(QWidget);
setAttribute(Qt::WA_SetPalette, palette.resolve() != 0); setAttribute(Qt::WA_SetPalette, palette.resolveMask() != 0);
// Determine which palette is inherited from this widget's ancestors and // Determine which palette is inherited from this widget's ancestors and
// QApplication::palette, resolve this against \a palette (attributes from // QApplication::palette, resolve this against \a palette (attributes from
@ -4414,7 +4414,7 @@ QPalette QWidgetPrivate::naturalWidgetPalette(QPalette::ResolveMask inheritedMas
if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) { if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) {
if (!naturalPalette.isCopyOf(QGuiApplication::palette())) { if (!naturalPalette.isCopyOf(QGuiApplication::palette())) {
QPalette inheritedPalette = p->palette(); QPalette inheritedPalette = p->palette();
inheritedPalette.resolve(inheritedMask); inheritedPalette.setResolveMask(inheritedMask);
naturalPalette = inheritedPalette.resolve(naturalPalette); naturalPalette = inheritedPalette.resolve(naturalPalette);
} else { } else {
naturalPalette = p->palette(); naturalPalette = p->palette();
@ -4424,12 +4424,12 @@ QPalette QWidgetPrivate::naturalWidgetPalette(QPalette::ResolveMask inheritedMas
#if QT_CONFIG(graphicsview) #if QT_CONFIG(graphicsview)
else if (extra && extra->proxyWidget) { else if (extra && extra->proxyWidget) {
QPalette inheritedPalette = extra->proxyWidget->palette(); QPalette inheritedPalette = extra->proxyWidget->palette();
inheritedPalette.resolve(inheritedMask); inheritedPalette.setResolveMask(inheritedMask);
naturalPalette = inheritedPalette.resolve(naturalPalette); naturalPalette = inheritedPalette.resolve(naturalPalette);
} }
#endif // QT_CONFIG(graphicsview) #endif // QT_CONFIG(graphicsview)
} }
naturalPalette.resolve(0); naturalPalette.setResolveMask(0);
return naturalPalette; return naturalPalette;
} }
/*! /*!
@ -4450,7 +4450,7 @@ void QWidgetPrivate::resolvePalette()
void QWidgetPrivate::setPalette_helper(const QPalette &palette) void QWidgetPrivate::setPalette_helper(const QPalette &palette)
{ {
Q_Q(QWidget); Q_Q(QWidget);
if (data.pal == palette && data.pal.resolve() == palette.resolve()) if (data.pal == palette && data.pal.resolveMask() == palette.resolveMask())
return; return;
data.pal = palette; data.pal = palette;
updateSystemBackground(); updateSystemBackground();
@ -4520,7 +4520,7 @@ void QWidget::setFont(const QFont &font)
style->saveWidgetFont(this, font); style->saveWidgetFont(this, font);
#endif #endif
setAttribute(Qt::WA_SetFont, font.resolve() != 0); setAttribute(Qt::WA_SetFont, font.resolveMask() != 0);
// Determine which font is inherited from this widget's ancestors and // Determine which font is inherited from this widget's ancestors and
// QApplication::font, resolve this against \a font (attributes from the // QApplication::font, resolve this against \a font (attributes from the
@ -4562,7 +4562,7 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
if (!naturalFont.isCopyOf(QApplication::font())) { if (!naturalFont.isCopyOf(QApplication::font())) {
if (inheritedMask != 0) { if (inheritedMask != 0) {
QFont inheritedFont = p->font(); QFont inheritedFont = p->font();
inheritedFont.resolve(inheritedMask); inheritedFont.setResolveMask(inheritedMask);
naturalFont = inheritedFont.resolve(naturalFont); naturalFont = inheritedFont.resolve(naturalFont);
} // else nothing to do (naturalFont = naturalFont) } // else nothing to do (naturalFont = naturalFont)
} else { } else {
@ -4574,13 +4574,13 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
else if (extra && extra->proxyWidget) { else if (extra && extra->proxyWidget) {
if (inheritedMask != 0) { if (inheritedMask != 0) {
QFont inheritedFont = extra->proxyWidget->font(); QFont inheritedFont = extra->proxyWidget->font();
inheritedFont.resolve(inheritedMask); inheritedFont.setResolveMask(inheritedMask);
naturalFont = inheritedFont.resolve(naturalFont); naturalFont = inheritedFont.resolve(naturalFont);
} // else nothing to do (naturalFont = naturalFont) } // else nothing to do (naturalFont = naturalFont)
} }
#endif // QT_CONFIG(graphicsview) #endif // QT_CONFIG(graphicsview)
} }
naturalFont.resolve(0); naturalFont.setResolveMask(0);
return naturalFont; return naturalFont;
} }
@ -4592,7 +4592,7 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const
QFont QWidgetPrivate::localFont() const QFont QWidgetPrivate::localFont() const
{ {
QFont localfont = data.fnt; QFont localfont = data.fnt;
localfont.resolve(directFontResolveMask); localfont.setResolveMask(directFontResolveMask);
return localfont; return localfont;
} }
@ -4636,18 +4636,18 @@ void QWidgetPrivate::updateFont(const QFont &font)
#if QT_CONFIG(graphicsview) #if QT_CONFIG(graphicsview)
if (!q->parentWidget() && extra && extra->proxyWidget) { if (!q->parentWidget() && extra && extra->proxyWidget) {
QGraphicsProxyWidget *p = extra->proxyWidget; QGraphicsProxyWidget *p = extra->proxyWidget;
inheritedFontResolveMask = p->d_func()->inheritedFontResolveMask | p->font().resolve(); inheritedFontResolveMask = p->d_func()->inheritedFontResolveMask | p->font().resolveMask();
} else } else
#endif // QT_CONFIG(graphicsview) #endif // QT_CONFIG(graphicsview)
if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) { if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) {
inheritedFontResolveMask = 0; inheritedFontResolveMask = 0;
} }
uint newMask = data.fnt.resolve() | inheritedFontResolveMask; uint newMask = data.fnt.resolveMask() | inheritedFontResolveMask;
// Set the font as also having resolved inherited traits, so the result of reading QWidget::font() // Set the font as also having resolved inherited traits, so the result of reading QWidget::font()
// isn't all weak information, but save the original mask to be able to let new changes on the // isn't all weak information, but save the original mask to be able to let new changes on the
// parent widget font propagate correctly. // parent widget font propagate correctly.
directFontResolveMask = data.fnt.resolve(); directFontResolveMask = data.fnt.resolveMask();
data.fnt.resolve(newMask); data.fnt.setResolveMask(newMask);
for (int i = 0; i < children.size(); ++i) { for (int i = 0; i < children.size(); ++i) {
QWidget *w = qobject_cast<QWidget*>(children.at(i)); QWidget *w = qobject_cast<QWidget*>(children.at(i));

4
src/widgets/kernel/qwidget_p.h
View File

@ -313,7 +313,7 @@ public:
void updateFont(const QFont &); void updateFont(const QFont &);
inline void setFont_helper(const QFont &font) { inline void setFont_helper(const QFont &font) {
if (directFontResolveMask == font.resolve() && data.fnt == font) if (directFontResolveMask == font.resolveMask() && data.fnt == font)
return; return;
updateFont(font); updateFont(font);
} }
@ -682,7 +682,7 @@ public:
// Other variables. // Other variables.
uint directFontResolveMask; uint directFontResolveMask;
uint inheritedFontResolveMask; uint inheritedFontResolveMask;
decltype(std::declval<QPalette>().resolve()) directPaletteResolveMask; decltype(std::declval<QPalette>().resolveMask()) directPaletteResolveMask;
QPalette::ResolveMask inheritedPaletteResolveMask; QPalette::ResolveMask inheritedPaletteResolveMask;
short leftmargin; short leftmargin;
short topmargin; short topmargin;

18
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -2679,13 +2679,13 @@ void QStyleSheetStyle::setPalette(QWidget *w)
rule.configurePalette(&p, map[i].group, ew, ew != w); rule.configurePalette(&p, map[i].group, ew, ew != w);
} }
if (!useStyleSheetPropagationInWidgetStyles || p.resolve() != 0) { if (!useStyleSheetPropagationInWidgetStyles || p.resolveMask() != 0) {
QPalette wp = w->palette(); QPalette wp = w->palette();
styleSheetCaches->customPaletteWidgets.insert(w, {wp, p.resolve()}); styleSheetCaches->customPaletteWidgets.insert(w, {wp, p.resolveMask()});
if (useStyleSheetPropagationInWidgetStyles) { if (useStyleSheetPropagationInWidgetStyles) {
p = p.resolve(wp); p = p.resolve(wp);
p.resolve(p.resolve() | wp.resolve()); p.setResolveMask(p.resolveMask() | wp.resolveMask());
} }
w->setPalette(p); w->setPalette(p);
@ -6109,18 +6109,18 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
if (useStyleSheetPropagationInWidgetStyles) { if (useStyleSheetPropagationInWidgetStyles) {
unsetStyleSheetFont(w); unsetStyleSheetFont(w);
if (rule.font.resolve()) { if (rule.font.resolveMask()) {
QFont wf = w->d_func()->localFont(); QFont wf = w->d_func()->localFont();
styleSheetCaches->customFontWidgets.insert(w, {wf, rule.font.resolve()}); styleSheetCaches->customFontWidgets.insert(w, {wf, rule.font.resolveMask()});
QFont font = rule.font.resolve(wf); QFont font = rule.font.resolve(wf);
font.resolve(wf.resolve() | rule.font.resolve()); font.setResolveMask(wf.resolveMask() | rule.font.resolveMask());
w->setFont(font); w->setFont(font);
} }
} else { } else {
QFont wf = w->d_func()->localFont(); QFont wf = w->d_func()->localFont();
QFont font = rule.font.resolve(wf); QFont font = rule.font.resolve(wf);
font.resolve(wf.resolve() | rule.font.resolve()); font.setResolveMask(wf.resolveMask() | rule.font.resolveMask());
if ((!w->isWindow() || w->testAttribute(Qt::WA_WindowPropagation)) if ((!w->isWindow() || w->testAttribute(Qt::WA_WindowPropagation))
&& isNaturalChild(w) && qobject_cast<QWidget *>(w->parent())) { && isNaturalChild(w) && qobject_cast<QWidget *>(w->parent())) {
@ -6128,11 +6128,11 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
font = font.resolve(static_cast<QWidget *>(w->parent())->font()); font = font.resolve(static_cast<QWidget *>(w->parent())->font());
} }
if (wf.resolve() == font.resolve() && wf == font) if (wf.resolveMask() == font.resolveMask() && wf == font)
return; return;
w->data->fnt = font; w->data->fnt = font;
w->d_func()->directFontResolveMask = font.resolve(); w->d_func()->directFontResolveMask = font.resolveMask();
QEvent e(QEvent::FontChange); QEvent e(QEvent::FontChange);
QCoreApplication::sendEvent(w, &e); QCoreApplication::sendEvent(w, &e);

8
src/widgets/styles/qstylesheetstyle_p.h
View File

@ -194,7 +194,7 @@ public:
template <typename T> template <typename T>
struct Tampered { struct Tampered {
T oldWidgetValue; T oldWidgetValue;
decltype(std::declval<T>().resolve()) resolveMask; decltype(std::declval<T>().resolveMask()) resolveMask;
// only call this function on an rvalue *this (it mangles oldWidgetValue) // only call this function on an rvalue *this (it mangles oldWidgetValue)
T reverted(T current) T reverted(T current)
@ -202,10 +202,10 @@ public:
&& &&
#endif #endif
{ {
oldWidgetValue.resolve(oldWidgetValue.resolve() & resolveMask); oldWidgetValue.setResolveMask(oldWidgetValue.resolveMask() & resolveMask);
current.resolve(current.resolve() & ~resolveMask); current.setResolveMask(current.resolveMask() & ~resolveMask);
current.resolve(oldWidgetValue); current.resolve(oldWidgetValue);
current.resolve(current.resolve() | oldWidgetValue.resolve()); current.setResolveMask(current.resolveMask() | oldWidgetValue.resolveMask());
return current; return current;
} }
}; };

4
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
View File

@ -510,7 +510,7 @@ void tst_QGuiApplication::keyboardModifiers()
*/ */
static bool palettesMatch(const QPalette &actual, const QPalette &expected) static bool palettesMatch(const QPalette &actual, const QPalette &expected)
{ {
if (actual.resolve() != expected.resolve()) if (actual.resolveMask() != expected.resolveMask())
return false; return false;
for (int i = 0; i < QPalette::NColorGroups; i++) { for (int i = 0; i < QPalette::NColorGroups; i++) {
@ -541,7 +541,7 @@ void tst_QGuiApplication::palette()
QCOMPARE(QGuiApplication::palette(), QPalette()); QCOMPARE(QGuiApplication::palette(), QPalette());
// The default application palette is not resolved // The default application palette is not resolved
QVERIFY(!QGuiApplication::palette().resolve()); QVERIFY(!QGuiApplication::palette().resolveMask());
QSignalSpy signalSpy(&app, SIGNAL(paletteChanged(QPalette))); QSignalSpy signalSpy(&app, SIGNAL(paletteChanged(QPalette)));

6
tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
View File

@ -132,7 +132,7 @@ static void compareAllPaletteData(const QPalette &firstPalette, const QPalette &
// For historical reasons, operator== compares only brushes, but it's not enough for proper // For historical reasons, operator== compares only brushes, but it's not enough for proper
// comparison after move/copy, because some additional data can also be moved/copied. // comparison after move/copy, because some additional data can also be moved/copied.
// Let's compare this data here. // Let's compare this data here.
QCOMPARE(firstPalette.resolve(), secondPalette.resolve()); QCOMPARE(firstPalette.resolveMask(), secondPalette.resolveMask());
QCOMPARE(firstPalette.currentColorGroup(), secondPalette.currentColorGroup()); QCOMPARE(firstPalette.currentColorGroup(), secondPalette.currentColorGroup());
} }
@ -233,7 +233,7 @@ void tst_QPalette::setAllPossibleBrushes()
{ {
QPalette p; QPalette p;
QCOMPARE(p.resolve(), QPalette::ResolveMask(0)); QCOMPARE(p.resolveMask(), QPalette::ResolveMask(0));
for (int r = 0; r < QPalette::NColorRoles; ++r) { for (int r = 0; r < QPalette::NColorRoles; ++r) {
p.setBrush(QPalette::All, QPalette::ColorRole(r), Qt::red); p.setBrush(QPalette::All, QPalette::ColorRole(r), Qt::red);
@ -248,7 +248,7 @@ void tst_QPalette::setAllPossibleBrushes()
void tst_QPalette::noBrushesSetForDefaultPalette() void tst_QPalette::noBrushesSetForDefaultPalette()
{ {
QCOMPARE(QPalette().resolve(), QPalette::ResolveMask(0)); QCOMPARE(QPalette().resolveMask(), QPalette::ResolveMask(0));
} }
void tst_QPalette::cannotCheckIfInvalidBrushSet() void tst_QPalette::cannotCheckIfInvalidBrushSet()

10
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -322,22 +322,22 @@ void tst_QFont::resetFont()
QWidget secondChild(&parent); QWidget secondChild(&parent);
secondChild.setFont(childFont); secondChild.setFont(childFont);
QVERIFY(parentFont.resolve() != 0); QVERIFY(parentFont.resolveMask() != 0);
QVERIFY(childFont.resolve() != 0); QVERIFY(childFont.resolveMask() != 0);
QVERIFY(childFont != parentFont); QVERIFY(childFont != parentFont);
// reset font on both children // reset font on both children
firstChild.setFont(QFont()); firstChild.setFont(QFont());
secondChild.setFont(QFont()); secondChild.setFont(QFont());
QCOMPARE(firstChild.font().resolve(), QFont::SizeResolved); QCOMPARE(firstChild.font().resolveMask(), QFont::SizeResolved);
QCOMPARE(secondChild.font().resolve(), QFont::SizeResolved); QCOMPARE(secondChild.font().resolveMask(), QFont::SizeResolved);
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
QEXPECT_FAIL("", "QTBUG-69214", Continue); QEXPECT_FAIL("", "QTBUG-69214", Continue);
#endif #endif
QCOMPARE(firstChild.font().pointSize(), parent.font().pointSize()); QCOMPARE(firstChild.font().pointSize(), parent.font().pointSize());
QCOMPARE(secondChild.font().pointSize(), parent.font().pointSize()); QCOMPARE(secondChild.font().pointSize(), parent.font().pointSize());
QVERIFY(parent.font().resolve() != 0); QVERIFY(parent.font().resolveMask() != 0);
} }
#endif #endif

16
tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
View File

@ -535,19 +535,19 @@ void tst_QTextFormat::setFont()
QCOMPARE((int)f.font().capitalization(), (int)f.fontCapitalization()); QCOMPARE((int)f.font().capitalization(), (int)f.fontCapitalization());
QCOMPARE(f.font().kerning(), f.fontKerning()); QCOMPARE(f.font().kerning(), f.fontKerning());
if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved))
QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint());
else else
QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint());
if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved))
QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy());
else else
QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy());
if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved))
QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization());
else else
QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization());
if (overrideAll || (font2.resolve() & QFont::KerningResolved)) if (overrideAll || (font2.resolveMask() & QFont::KerningResolved))
QCOMPARE(f.font().kerning(), font2.kerning()); QCOMPARE(f.font().kerning(), font2.kerning());
else else
QCOMPARE(f.font().kerning(), font1.kerning()); QCOMPARE(f.font().kerning(), font1.kerning());
@ -639,19 +639,19 @@ void tst_QTextFormat::setFont_collection()
int formatIndex = collection.indexForFormat(tmp); int formatIndex = collection.indexForFormat(tmp);
QTextCharFormat f = collection.charFormat(formatIndex); QTextCharFormat f = collection.charFormat(formatIndex);
if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved))
QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint());
else else
QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint());
if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved))
QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy());
else else
QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy());
if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved))
QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization());
else else
QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization());
if (overrideAll || (font2.resolve() & QFont::KerningResolved)) if (overrideAll || (font2.resolveMask() & QFont::KerningResolved))
QCOMPARE(f.font().kerning(), font2.kerning()); QCOMPARE(f.font().kerning(), font2.kerning());
else else
QCOMPARE(f.font().kerning(), font1.kerning()); QCOMPARE(f.font().kerning(), font1.kerning());

66
tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -640,11 +640,11 @@ void tst_QGraphicsWidget::fontPropagatesResolveToChildren()
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(root->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child2->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child3->font().resolveMask(), uint(QFont::StyleResolved));
} }
void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren() void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren()
@ -675,12 +675,12 @@ void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren()
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
} }
void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget() void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget()
@ -711,12 +711,12 @@ void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget()
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
} }
void tst_QGraphicsWidget::fontPropagatesResolveFromScene() void tst_QGraphicsWidget::fontPropagatesResolveFromScene()
@ -747,16 +747,16 @@ void tst_QGraphicsWidget::fontPropagatesResolveFromScene()
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(root->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child2->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(child3->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
} }
void tst_QGraphicsWidget::fontPropagatesResolveInParentChange() void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
@ -785,8 +785,8 @@ void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
QVERIFY(!grandChild2->font().italic()); QVERIFY(!grandChild2->font().italic());
QVERIFY(grandChild2->font().bold()); QVERIFY(grandChild2->font().bold());
QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild2->font().resolve(), uint(QFont::WeightResolved)); QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::WeightResolved));
grandChild2->setParentItem(child1); grandChild2->setParentItem(child1);
@ -800,8 +800,8 @@ void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
QVERIFY(grandChild2->font().italic()); QVERIFY(grandChild2->font().italic());
QVERIFY(!grandChild2->font().bold()); QVERIFY(!grandChild2->font().bold());
QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
} }
@ -911,12 +911,12 @@ void tst_QGraphicsWidget::fontPropagationWidgetItemWidget()
widget->setFont(font); widget->setFont(font);
QCOMPARE(widget2->font().pointSize(), 43); QCOMPARE(widget2->font().pointSize(), 43);
QCOMPARE(widget2->font().resolve(), uint(QFont::SizeResolved)); QCOMPARE(widget2->font().resolveMask(), uint(QFont::SizeResolved));
widget->setFont(QFont()); widget->setFont(QFont());
QCOMPARE(widget2->font().pointSize(), qApp->font().pointSize()); QCOMPARE(widget2->font().pointSize(), qApp->font().pointSize());
QCOMPARE(widget2->font().resolve(), QFont().resolve()); QCOMPARE(widget2->font().resolveMask(), QFont().resolveMask());
} }
void tst_QGraphicsWidget::fontPropagationSceneChange() void tst_QGraphicsWidget::fontPropagationSceneChange()

10
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -1836,7 +1836,7 @@ void tst_QApplication::applicationPalettePolish()
qputenv("QT_DESKTOP_STYLE_KEY", "customstyle"); qputenv("QT_DESKTOP_STYLE_KEY", "customstyle");
QApplication app(argc, &argv0); QApplication app(argc, &argv0);
QVERIFY(CustomStyle::polished); QVERIFY(CustomStyle::polished);
QVERIFY(!app.palette().resolve()); QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red); QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
qunsetenv("QT_DESKTOP_STYLE_KEY"); qunsetenv("QT_DESKTOP_STYLE_KEY");
} }
@ -1846,7 +1846,7 @@ void tst_QApplication::applicationPalettePolish()
QApplication::setStyle(new CustomStyle); QApplication::setStyle(new CustomStyle);
QApplication app(argc, &argv0); QApplication app(argc, &argv0);
QVERIFY(CustomStyle::polished); QVERIFY(CustomStyle::polished);
QVERIFY(!app.palette().resolve()); QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red); QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
} }
@ -1854,13 +1854,13 @@ void tst_QApplication::applicationPalettePolish()
QApplication app(argc, &argv0); QApplication app(argc, &argv0);
app.setStyle(new CustomStyle); app.setStyle(new CustomStyle);
QVERIFY(CustomStyle::polished); QVERIFY(CustomStyle::polished);
QVERIFY(!app.palette().resolve()); QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red); QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
CustomStyle::polished = 0; CustomStyle::polished = 0;
app.setPalette(QPalette()); app.setPalette(QPalette());
QVERIFY(CustomStyle::polished); QVERIFY(CustomStyle::polished);
QVERIFY(!app.palette().resolve()); QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red); QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
CustomStyle::polished = 0; CustomStyle::polished = 0;
@ -1868,7 +1868,7 @@ void tst_QApplication::applicationPalettePolish()
palette.setColor(QPalette::Active, QPalette::Highlight, Qt::green); palette.setColor(QPalette::Active, QPalette::Highlight, Qt::green);
app.setPalette(palette); app.setPalette(palette);
QVERIFY(CustomStyle::polished); QVERIFY(CustomStyle::polished);
QVERIFY(app.palette().resolve()); QVERIFY(app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red); QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
QCOMPARE(app.palette().color(QPalette::Highlight), Qt::green); QCOMPARE(app.palette().color(QPalette::Highlight), Qt::green);
} }

8
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
View File

@ -2111,13 +2111,13 @@ void tst_QStyleSheetStyle::widgetStylePropagation()
QLabel childLabel(&parentLabel); QLabel childLabel(&parentLabel);
childLabel.setObjectName("childLabel"); childLabel.setObjectName("childLabel");
if (parentFont.resolve()) if (parentFont.resolveMask())
parentLabel.setFont(parentFont); parentLabel.setFont(parentFont);
if (childFont.resolve()) if (childFont.resolveMask())
childLabel.setFont(childFont); childLabel.setFont(childFont);
if (parentPalette.resolve()) if (parentPalette.resolveMask())
parentLabel.setPalette(parentPalette); parentLabel.setPalette(parentPalette);
if (childPalette.resolve()) if (childPalette.resolveMask())
childLabel.setPalette(childPalette); childLabel.setPalette(childPalette);
if (!parentStyleSheet.isEmpty()) if (!parentStyleSheet.isEmpty())
parentLabel.setStyleSheet(parentStyleSheet); parentLabel.setStyleSheet(parentStyleSheet);

2
tests/manual/textrendering/nativetext/main.cpp
View File

@ -125,7 +125,7 @@ public:
p.setPen(palette().text().color()); p.setPen(palette().text().color());
QFont f = font(); QFont f = font();
f.resolve(-1); f.setResolveMask(-1);
p.setFont(f); p.setFont(f);
p.drawText(QPoint(0, ascent), text()); p.drawText(QPoint(0, ascent), text());