From 32b638a2eb95e030fbee8f00a0b9f2eb98ef8a92 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 12 Mar 2020 09:54:54 +0100 Subject: [PATCH] qhighdpiscaling_p.h does not compile with disabled deprecations --- src/common/QskFunctions.cpp | 23 +++++++++++++++-------- src/common/QskFunctions.h | 1 - 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/common/QskFunctions.cpp b/src/common/QskFunctions.cpp index 229c2bfa..9cb22b1f 100644 --- a/src/common/QskFunctions.cpp +++ b/src/common/QskFunctions.cpp @@ -5,7 +5,6 @@ #include QSK_QT_PRIVATE_BEGIN -#include #include QSK_QT_PRIVATE_END @@ -147,13 +146,6 @@ qreal qskDpiScaled( qreal value ) return value * factor; } -qreal qskGlobalScaleFactor() -{ - // The value of QT_SCALE_FACTOR - const QScreen* noScreen = nullptr; - return QHighDpiScaling::factor( noScreen ); -} - bool qskHasPlatformWindowManagement() { if ( auto platform = QGuiApplicationPrivate::platformIntegration() ) @@ -169,3 +161,18 @@ QRect qskPlatformScreenGeometry( const QScreen* screen ) return screen->handle()->geometry(); } + +#if 0 + +QSK_QT_PRIVATE_BEGIN +#include +QSK_QT_PRIVATE_END + +qreal qskGlobalScaleFactor() +{ + // The value of QT_SCALE_FACTOR + const QScreen* noScreen = nullptr; + return QHighDpiScaling::factor( noScreen ); +} + +#endif diff --git a/src/common/QskFunctions.h b/src/common/QskFunctions.h index 18c3ab78..aac6a956 100644 --- a/src/common/QskFunctions.h +++ b/src/common/QskFunctions.h @@ -14,7 +14,6 @@ class QScreen; QSK_EXPORT qreal qskDpiScaled( qreal value ); -QSK_EXPORT qreal qskGlobalScaleFactor(); QSK_EXPORT bool qskHasPlatformWindowManagement(); QSK_EXPORT QRect qskPlatformScreenGeometry( const QScreen* );