Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index a871fe0024..e790e3094f 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -472,8 +472,9 @@ QVector<T> fromNativePixels(const QVector<T> &pixelValues, const QWindow *window
 
     QVector<T> pointValues;
     pointValues.reserve(pixelValues.size());
+    const auto factor = QHighDpiScaling::factor(window);
     for (const T &pixelValue : pixelValues)
-        pointValues.append(pixelValue / QHighDpiScaling::factor(window));
+        pointValues.append(pixelValue / factor);
     return pointValues;
 }
 
@@ -486,8 +487,9 @@ QVector<T> toNativePixels(const QVector<T> &pointValues, const QWindow *window)
 
     QVector<T> pixelValues;
     pixelValues.reserve(pointValues.size());
+    const auto factor = QHighDpiScaling::factor(window);
     for (const T &pointValue : pointValues)
-        pixelValues.append(pointValue * QHighDpiScaling::factor(window));
+        pixelValues.append(pointValue * factor);
     return pixelValues;
 }