Rename confusingly named QFont/QPalette::resolve overloads

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>

1 files changed, 5 insertions, 5 deletions

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);
     }