diff options
author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-13 17:28:22 +0900 |
---|---|---|
committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-14 02:20:07 +0900 |
commit | f87a541e26f8fd4ada963d3b832cb235d3cf45d9 (patch) | |
tree | bd37c24bf2caec49e6c4d8db83f5a77c1fa521ef /src/gui/kernel/qhighdpiscaling_p.h | |
parent | e8c1cd5d88bbcfbdee9d6c5e3fb54800f5ecf49e (diff) |
Fix build without features.highdpi
Add four template functions missing in stub.
Change-Id: I7ca126f866a76efc26167340ff2e35a60775078b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling_p.h')
-rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index e85a9b4bd6..3e7ba2f5e1 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -366,9 +366,9 @@ public: static inline QPoint origin(const QPlatformScreen *) { return QPoint(); } static inline QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *) { return pos; } static inline QPoint mapPositionToNative(const QPoint &pos, const QPlatformScreen *) { return pos; } - static inline QPointF mapPositionToGlobal(const QPointF &pos, const QPoint &windowGlobalPosition, const QWindow *window) { return pos; } - static inline QPointF mapPositionFromGlobal(const QPointF &pos, const QPoint &windowGlobalPosition, const QWindow *window) { return pos; } - static inline QDpi logicalDpi(const QScreen *screen) { return QDpi(-1,-1); } + static inline QPointF mapPositionToGlobal(const QPointF &pos, const QPoint &, const QWindow *) { return pos; } + static inline QPointF mapPositionFromGlobal(const QPointF &pos, const QPoint &, const QWindow *) { return pos; } + static inline QDpi logicalDpi(const QScreen *) { return QDpi(-1,-1); } }; namespace QHighDpi { @@ -381,6 +381,14 @@ namespace QHighDpi { T fromNativeLocalPosition(const T &value, ...) { return value; } template <typename T> inline T toNativeLocalPosition(const T &value, ...) { return value; } + template <typename T, typename C> inline + T fromNativeGlobalPosition(const T &value, const C *) { return value; } + template <typename T, typename C> inline + T toNativeGlobalPosition(const T &value, const C *) { return value; } + template <typename T, typename C> inline + T fromNativeWindowGeometry(const T &value, const C *) { return value; } + template <typename T, typename C> inline + T toNativeWindowGeometry(const T &value, const C *) { return value; } template <typename T> inline T fromNativeLocalRegion(const T &value, ...) { return value; } |