summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp66
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp10
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp8
3 files changed, 42 insertions, 42 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 882aa8bcbd..4298cc3da7 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -640,11 +640,11 @@ void tst_QGraphicsWidget::fontPropagatesResolveToChildren()
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
- QCOMPARE(font.resolve(), uint(QFont::StyleResolved));
- QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved));
+ QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(root->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child2->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child3->font().resolveMask(), uint(QFont::StyleResolved));
}
void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren()
@@ -675,12 +675,12 @@ void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren()
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
- QCOMPARE(font.resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved));
+ QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
}
void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget()
@@ -711,12 +711,12 @@ void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget()
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
- QCOMPARE(font.resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved));
+ QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
}
void tst_QGraphicsWidget::fontPropagatesResolveFromScene()
@@ -747,16 +747,16 @@ void tst_QGraphicsWidget::fontPropagatesResolveFromScene()
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
- QCOMPARE(font.resolve(), uint(QFont::StyleResolved));
- QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved));
+ QCOMPARE(font.resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(root->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child2->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(child3->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild3->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild4->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild5->font().resolveMask(), uint(QFont::StyleResolved));
}
void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
@@ -785,8 +785,8 @@ void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
QVERIFY(!grandChild2->font().italic());
QVERIFY(grandChild2->font().bold());
- QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild2->font().resolve(), uint(QFont::WeightResolved));
+ QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::WeightResolved));
grandChild2->setParentItem(child1);
@@ -800,8 +800,8 @@ void tst_QGraphicsWidget::fontPropagatesResolveInParentChange()
QVERIFY(grandChild2->font().italic());
QVERIFY(!grandChild2->font().bold());
- QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved));
- QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild1->font().resolveMask(), uint(QFont::StyleResolved));
+ QCOMPARE(grandChild2->font().resolveMask(), uint(QFont::StyleResolved));
}
@@ -911,12 +911,12 @@ void tst_QGraphicsWidget::fontPropagationWidgetItemWidget()
widget->setFont(font);
QCOMPARE(widget2->font().pointSize(), 43);
- QCOMPARE(widget2->font().resolve(), uint(QFont::SizeResolved));
+ QCOMPARE(widget2->font().resolveMask(), uint(QFont::SizeResolved));
widget->setFont(QFont());
QCOMPARE(widget2->font().pointSize(), qApp->font().pointSize());
- QCOMPARE(widget2->font().resolve(), QFont().resolve());
+ QCOMPARE(widget2->font().resolveMask(), QFont().resolveMask());
}
void tst_QGraphicsWidget::fontPropagationSceneChange()
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 611ae3474b..0ba42c0e36 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1836,7 +1836,7 @@ void tst_QApplication::applicationPalettePolish()
qputenv("QT_DESKTOP_STYLE_KEY", "customstyle");
QApplication app(argc, &argv0);
QVERIFY(CustomStyle::polished);
- QVERIFY(!app.palette().resolve());
+ QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
qunsetenv("QT_DESKTOP_STYLE_KEY");
}
@@ -1846,7 +1846,7 @@ void tst_QApplication::applicationPalettePolish()
QApplication::setStyle(new CustomStyle);
QApplication app(argc, &argv0);
QVERIFY(CustomStyle::polished);
- QVERIFY(!app.palette().resolve());
+ QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
}
@@ -1854,13 +1854,13 @@ void tst_QApplication::applicationPalettePolish()
QApplication app(argc, &argv0);
app.setStyle(new CustomStyle);
QVERIFY(CustomStyle::polished);
- QVERIFY(!app.palette().resolve());
+ QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
CustomStyle::polished = 0;
app.setPalette(QPalette());
QVERIFY(CustomStyle::polished);
- QVERIFY(!app.palette().resolve());
+ QVERIFY(!app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
CustomStyle::polished = 0;
@@ -1868,7 +1868,7 @@ void tst_QApplication::applicationPalettePolish()
palette.setColor(QPalette::Active, QPalette::Highlight, Qt::green);
app.setPalette(palette);
QVERIFY(CustomStyle::polished);
- QVERIFY(app.palette().resolve());
+ QVERIFY(app.palette().resolveMask());
QCOMPARE(app.palette().color(QPalette::Link), Qt::red);
QCOMPARE(app.palette().color(QPalette::Highlight), Qt::green);
}
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 00939e5118..b61faf6c2b 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -2111,13 +2111,13 @@ void tst_QStyleSheetStyle::widgetStylePropagation()
QLabel childLabel(&parentLabel);
childLabel.setObjectName("childLabel");
- if (parentFont.resolve())
+ if (parentFont.resolveMask())
parentLabel.setFont(parentFont);
- if (childFont.resolve())
+ if (childFont.resolveMask())
childLabel.setFont(childFont);
- if (parentPalette.resolve())
+ if (parentPalette.resolveMask())
parentLabel.setPalette(parentPalette);
- if (childPalette.resolve())
+ if (childPalette.resolveMask())
childLabel.setPalette(childPalette);
if (!parentStyleSheet.isEmpty())
parentLabel.setStyleSheet(parentStyleSheet);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 19:34:43 +0000