Volker Hilsheimer b77a3f47c9 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>		2020-08-25 17:59:10 +02:00
..
.gitignore
CMakeLists.txt	CMake: Regenerate tests with new qt_ prefixed APIs	2020-07-09 09:38:35 +02:00
qpalette.pro
tst_qpalette.cpp	Rename confusingly named QFont/QPalette::resolve overloads	2020-08-25 17:59:10 +02:00