Utils: Move defaultHighDpiScaleFactorRoundingPolicy() to StyleHelper

... from HostOSInfo. A better suited place.

Amends: 3726f0d6c1

Change-Id: I5ba052603ae438b9347f1091088f0d105d19f587
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/app/main.cpp

@@ -19,6 +19,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcsettings.h>
 #include <utils/singleton.h>
+#include <utils/stylehelper.h>
 #include <utils/temporarydirectory.h>
 #include <utils/terminalcommand.h>
 
@@ -286,7 +287,7 @@ static void setHighDpiEnvironmentVariable()
     std::unique_ptr<Utils::QtcSettings> settings(createUserSettings());
 
     using Policy = Qt::HighDpiScaleFactorRoundingPolicy;
-    const Policy defaultPolicy = Utils::HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy();
+    const Policy defaultPolicy = Utils::StyleHelper::defaultHighDpiScaleFactorRoundingPolicy();
     const Policy userPolicy = settings->value("Core/HighDpiScaleFactorRoundingPolicy",
                                               int(defaultPolicy)).value<Policy>();
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(userPolicy);

src/libs/utils/hostosinfo.h

@@ -90,12 +90,6 @@ public:
 
     static const FilePath &root();
 
-    static constexpr Qt::HighDpiScaleFactorRoundingPolicy
-    defaultHighDpiScaleFactorRoundingPolicy() {
-        return isMacHost() ? Qt::HighDpiScaleFactorRoundingPolicy::Unset
-                           : Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
-    }
-
 private:
     static Qt::CaseSensitivity m_overrideFileNameCaseSensitivity;
     static bool m_useOverrideFileNameCaseSensitivity;

src/libs/utils/stylehelper.cpp

@@ -712,6 +712,12 @@ bool StyleHelper::isQDSTheme()
     return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false;
 }
 
+Qt::HighDpiScaleFactorRoundingPolicy StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()
+{
+    return HostOsInfo::isMacHost() ? Qt::HighDpiScaleFactorRoundingPolicy::Unset
+                                   : Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
+}
+
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
 {
     QFontDatabase a;

src/libs/utils/stylehelper.h

@@ -107,6 +107,9 @@ QTCREATOR_UTILS_EXPORT void setPanelWidgetSingleRow(QWidget *widget, bool value
 
 QTCREATOR_UTILS_EXPORT bool isQDSTheme();
 
+QTCREATOR_UTILS_EXPORT
+    Qt::HighDpiScaleFactorRoundingPolicy defaultHighDpiScaleFactorRoundingPolicy();
+
 class IconFontHelper
 {
 public:

src/plugins/coreplugin/generalsettings.cpp

@@ -148,7 +148,7 @@ GeneralSettingsWidget::GeneralSettingsWidget()
 
         const Policy userPolicy =
             ICore::settings()->value(settingsKeyDpiPolicy,
-                                     int(HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy()))
+                                     int(StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()))
                                       .value<Policy>();
         m_policyComboBox->setCurrentIndex(m_policyComboBox->findData(int(userPolicy)));
 
@@ -343,7 +343,7 @@ void GeneralSettingsWidget::setDpiPolicy(Qt::HighDpiScaleFactorRoundingPolicy po
         dialog.exec();
     }
     settings->setValueWithDefault(settingsKeyDpiPolicy, int(policy),
-                                  int(HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy()));
+                                  int(StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()));
 }
 
 void GeneralSettings::applyToolbarStyleFromSettings()