whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build without features.highdpiscaling 

Change-Id: I9fee7303d53be228546accbcdf29a63b52e3f625
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
bb10
Tasuku Suzuki 2020-06-03 22:18:39 +09:00
parent e11939afee
commit 31d2804e7a
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/kernel/qhighdpiscaling.cpp
View File

@ -720,5 +720,20 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w
return scaleAndOrigin(screen, searchScreen ? nativePosition : nullptr);
}
#else
QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QPlatformScreen *, QPoint *)
{
return { qreal(1), QPoint() };
}
QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QScreen *, QPoint *)
{
return { qreal(1), QPoint() };
}
QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *, QPoint *)
{
return { qreal(1), QPoint() };
}
#endif //QT_NO_HIGHDPISCALING
QT_END_NAMESPACE

9
src/gui/kernel/qhighdpiscaling_p.h
View File

@ -303,6 +303,15 @@ public:
static inline void setGlobalFactor(qreal) {}
static inline void setScreenFactor(QScreen *, qreal) {}
struct ScaleAndOrigin
{
qreal factor;
QPoint origin;
};
static ScaleAndOrigin scaleAndOrigin(const QPlatformScreen *platformScreen, QPoint *nativePosition = nullptr);
static ScaleAndOrigin scaleAndOrigin(const QScreen *screen, QPoint *nativePosition = nullptr);
static ScaleAndOrigin scaleAndOrigin(const QWindow *platformScreen, QPoint *nativePosition = nullptr);
static inline bool isActive() { return false; }
static inline qreal factor(const QWindow *) { return 1.0; }
static inline qreal factor(const QScreen *) { return 1.0; }