diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-05-17 13:27:55 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-06-09 21:53:48 +0000 |
| commit | db7b958fb2d82a85ef45eba852cf411ebde852bf (patch) | |
| tree | 92e21231883b5451385e9747eba18bcd99f72c94 /src/compositor/compositor_api/qwaylandquickitem.cpp | |
| parent | 590d2e313c5a10dc9c7d61a654ada451e5df82aa (diff) | |
Add support for building QtWayland on macOS
Change-Id: I98aadd5019e913bf0adcf0122b7b209981926278
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index d4cc94e4b..09e8f7621 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1338,8 +1338,12 @@ void QWaylandQuickItem::handleDragStarted(QWaylandDrag *drag) qreal QWaylandQuickItemPrivate::scaleFactor() const { - return (view->output() ? view->output()->scaleFactor() : 1) - / (window ? window->devicePixelRatio() : 1); + qreal f = view->output() ? view->output()->scaleFactor() : 1; +#if !defined(Q_OS_MACOS) + if (window) + f /= window->devicePixelRatio(); +#endif + return f; } QT_END_NAMESPACE |