summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qhighdpiscaling.cpp
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-04-15 16:08:54 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-04-15 16:08:54 +0200
commitd450fcf0625700021b9646080f6ce0e7059f243d (patch)
tree86a3a1cd43d344d2953ad82d16617eccefe7d73f /src/gui/kernel/qhighdpiscaling.cpp
parent4e541c356943fa304b2841b5234a689c4cc93f45 (diff)
DevicePixels -> NativePixels
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling.cpp')
-rw-r--r--src/gui/kernel/qhighdpiscaling.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 0d847a243f..ff3f48b33f 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -124,14 +124,14 @@ qreal QHighDpiScaling::factor(const QWindow *window)
return f * (windowFactor.isValid() ? windowFactor.toReal() : 1);
}
-Q_GUI_EXPORT QSize QHighDpi::toDevicePixelsConstrained(const QSize &size, const QWindow *window)
+Q_GUI_EXPORT QSize QHighDpi::toNativePixelsConstrained(const QSize &size, const QWindow *window)
{
const int width = size.width();
const int height = size.height();
return QSize(width > 0 && width < QWINDOWSIZE_MAX ?
- QHighDpi::toDevicePixels(width, window) : width,
+ QHighDpi::toNativePixels(width, window) : width,
height > 0 && height < QWINDOWSIZE_MAX ?
- QHighDpi::toDevicePixels(height, window) : height);
+ QHighDpi::toNativePixels(height, window) : height);
}
QT_END_NAMESPACE