diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-01 08:23:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-01 08:23:55 +0100 |
| commit | 24cd4a71905a481d937cbd5c4cb9fb8bb91532c9 (patch) | |
| tree | 67195b6b5fd1a1ddabc0f622082383ad65c94dfb /src/gui/kernel/qhighdpiscaling_p.h | |
| parent | aeb169a48869f4f50237e384e57ccb406228f620 (diff) | |
| parent | 1dd0c4bf1af1c90fde1449a81d41acbc62cf1934 (diff) | |
| download | qtbase-24cd4a71905a481d937cbd5c4cb9fb8bb91532c9.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic7aaa06f4a14b1aed61faa1a6e7f527ee0eeb96b
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling_p.h')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index a48ad3180d..a871fe0024 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -168,7 +168,7 @@ inline QRect toNative(const QRect &rect, qreal scaleFactor, const QPoint &origin inline QRect fromNative(const QRect &rect, const QScreen *screen, const QPoint &screenOrigin) { - return toNative(rect, QHighDpiScaling::factor(screen), screenOrigin); + return fromNative(rect, QHighDpiScaling::factor(screen), screenOrigin); } inline QRect fromNativeScreenGeometry(const QRect &nativeScreenGeometry, const QScreen *screen) |