summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformscreen.h
diff options
context:
space:
mode:
authorFushan Wen <qydwhotmail@gmail.com>2022-05-29 19:08:17 +0800
committerFushan Wen <qydwhotmail@gmail.com>2022-06-29 20:44:32 +0800
commit7b2ae3faab15913e006ece25d785e6a8453dd27a (patch)
tree2003744b64c3ce591c1a11d4a7679615c7369780 /src/gui/kernel/qplatformscreen.h
parent9fcd5f0790fd01307cfece96d82df21c787fa5b3 (diff)
Drop call to setPlatformScreen in QHighDpiScaling::setScreenFactor
Drop call to setPlatformScreen since the only affected variables are logicalDpi and geometry. Replace setPlatformScreen with updateLogicalDpi which handles global scale factor changes in QScreen. Call updateGeometriesWithSignals() to check if there are any changes in geometry or availableGeometry, since the geometry or availableGeometry can also change when setting a scale factor. Move setPlatformScreen to QScreen ctor as the function is not used elsewhere. Pick-to: 6.4 6.3 6.2 Change-Id: I7acf40bf0643e89a1d9177674d66dc503829f98f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatformscreen.h')
-rw-r--r--src/gui/kernel/qplatformscreen.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h
index ca828171ff..1d8e103606 100644
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -135,7 +135,7 @@ protected:
QScopedPointer<QPlatformScreenPrivate> d_ptr;
private:
- friend class QScreenPrivate;
+ friend QScreen;
};
// Qt doesn't currently support running with no platform screen