From c744356b0fa2069fbf569ab37a1e4c5cbd3da529 Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 4 Dec 2021 19:12:11 +0100 Subject: [PATCH] Add preprocessor to check Qt version Use to check if Qt is 5.14 for using QGuiApplication::setHighDpiScaleFactorRoundingPolicy --- sources/ui/configpage/generalconfigurationpage.cpp | 2 ++ sources/utils/qetsettings.cpp | 3 ++- sources/utils/qetsettings.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 61aedafc4..c0a859861 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -178,8 +178,10 @@ void GeneralConfigurationPage::applyConf() settings.setValue("lang", ui->m_lang_cb->itemData(ui->m_lang_cb->currentIndex()).toString()); //hdpi +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QetSettings::setHdpiScaleFactorRoundingPolicy(ui->m_hdpi_round_policy_cb->currentData().toString()); QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy()); +#endif //ELEMENT EDITOR settings.setValue("elementeditor/default-informations", ui->m_default_elements_info->toPlainText()); diff --git a/sources/utils/qetsettings.cpp b/sources/utils/qetsettings.cpp index 6f07f727f..e0ae5a0d7 100644 --- a/sources/utils/qetsettings.cpp +++ b/sources/utils/qetsettings.cpp @@ -22,7 +22,7 @@ namespace QetSettings { - +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) /** * @brief setHdpiScaleFactorRoundingPolicy * Write the value of HdpiScaleFactorRoundingPolicy in @@ -106,4 +106,5 @@ namespace QetSettings return default_policy; } } +#endif } diff --git a/sources/utils/qetsettings.h b/sources/utils/qetsettings.h index d3c803cd1..80c246e2e 100644 --- a/sources/utils/qetsettings.h +++ b/sources/utils/qetsettings.h @@ -28,10 +28,12 @@ */ namespace QetSettings { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) void setHdpiScaleFactorRoundingPolicy(const QString &policy_str); void setHdpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy policy); Qt::HighDpiScaleFactorRoundingPolicy hdpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy default_policy = Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); +#endif } #endif // QETSETTINGS_H