qhighdpiscaling_p.h does not compile with disabled deprecations
This commit is contained in:
parent
b2537351ad
commit
32b638a2eb
@ -5,7 +5,6 @@
|
||||
#include <qscreen.h>
|
||||
|
||||
QSK_QT_PRIVATE_BEGIN
|
||||
#include <private/qhighdpiscaling_p.h>
|
||||
#include <private/qguiapplication_p.h>
|
||||
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 <private/qhighdpiscaling_p.h>
|
||||
QSK_QT_PRIVATE_END
|
||||
|
||||
qreal qskGlobalScaleFactor()
|
||||
{
|
||||
// The value of QT_SCALE_FACTOR
|
||||
const QScreen* noScreen = nullptr;
|
||||
return QHighDpiScaling::factor( noScreen );
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -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* );
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user