5 files changed, 15 insertions, 10 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index 364dfaeaee..eb3a9d5545 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -474,8 +474,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;
 }
 
@@ -488,8 +489,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;
 }
 
diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp
index 37db608430..8ab5c08442 100644
--- a/src/gui/kernel/qopenglwindow.cpp
+++ b/src/gui/kernel/qopenglwindow.cpp
@@ -252,9 +252,10 @@ void QOpenGLWindowPrivate::beginPaint(const QRegion &region)
         if (!fbo || fbo->size() != deviceSize) {
             QOpenGLFramebufferObjectFormat fboFormat;
             fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-            if (q->requestedFormat().samples() > 0) {
+            const int samples = q->requestedFormat().samples();
+            if (samples > 0) {
                 if (updateBehavior != QOpenGLWindow::PartialUpdateBlend)
-                    fboFormat.setSamples(q->requestedFormat().samples());
+                    fboFormat.setSamples(samples);
                 else
                     qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
             }
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 347d02d616..e45a1d61ba 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -499,9 +499,10 @@ QPlatformScreen *QPlatformWindow::screenForGeometry(const QRect &newGeometry) co
     if (!parent() && currentScreen && !currentScreen->geometry().contains(center)) {
         const auto screens = currentScreen->virtualSiblings();
         for (QPlatformScreen *screen : screens) {
-            if (screen->geometry().contains(center))
+            const QRect screenGeometry = screen->geometry();
+            if (screenGeometry.contains(center))
                 return screen;
-            if (screen->geometry().intersects(newGeometry))
+            if (screenGeometry.intersects(newGeometry))
                 fallback = screen;
         }
     }
diff --git a/src/gui/kernel/qrasterwindow.cpp b/src/gui/kernel/qrasterwindow.cpp
index 947f2bb6a8..d8d448249e 100644
--- a/src/gui/kernel/qrasterwindow.cpp
+++ b/src/gui/kernel/qrasterwindow.cpp
@@ -73,8 +73,9 @@ public:
     void beginPaint(const QRegion &region) Q_DECL_OVERRIDE
     {
         Q_Q(QRasterWindow);
-        if (backingstore->size() != q->size()) {
-            backingstore->resize(q->size());
+        const QSize size = q->size();
+        if (backingstore->size() != size) {
+            backingstore->resize(size);
             markWindowAsDirty();
         }
         backingstore->beginPaint(region);
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 3f430be579..107ea73a56 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1469,9 +1469,9 @@ void QWindow::setGeometry(const QRect &rect)
 {
     Q_D(QWindow);
     d->positionAutomatic = false;
-    if (rect == geometry())
+    const QRect oldRect = geometry();
+    if (rect == oldRect)
         return;
-    QRect oldRect = geometry();
 
     d->positionPolicy = QWindowPrivate::WindowFrameExclusive;
     if (d->platformWindow) {