1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618334477

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-13 21:33:41 +00:00
commit d197ad0e2a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,9 +366,9 @@ public:
static inline QPoint origin(const QPlatformScreen *) { return QPoint(); } static inline QPoint origin(const QPlatformScreen *) { return QPoint(); }
static inline QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *) { return pos; } static inline QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *) { return pos; }
static inline QPoint mapPositionToNative(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 mapPositionToGlobal(const QPointF &pos, const QPoint &, const QWindow *) { return pos; }
static inline QPointF mapPositionFromGlobal(const QPointF &pos, const QPoint &windowGlobalPosition, const QWindow *window) { return pos; } static inline QPointF mapPositionFromGlobal(const QPointF &pos, const QPoint &, const QWindow *) { return pos; }
static inline QDpi logicalDpi(const QScreen *screen) { return QDpi(-1,-1); } static inline QDpi logicalDpi(const QScreen *) { return QDpi(-1,-1); }
}; };
namespace QHighDpi { namespace QHighDpi {
@ -381,6 +381,14 @@ namespace QHighDpi {
T fromNativeLocalPosition(const T &value, ...) { return value; } T fromNativeLocalPosition(const T &value, ...) { return value; }
template <typename T> inline template <typename T> inline
T toNativeLocalPosition(const T &value, ...) { return value; } 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 template <typename T> inline
T fromNativeLocalRegion(const T &value, ...) { return value; } T fromNativeLocalRegion(const T &value, ...) { return value; }