diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-19 17:57:08 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-22 19:42:55 +0000 |
| commit | 392566cf61204dd28be0a6f2a252f9b5bd064e00 (patch) | |
| tree | 557114a36c688806f608fafadae855f1e3f8a808 /src/gui/kernel/qplatformscreen.h | |
| parent | 5a5bc86028b2967ffccf151a9463459e67b96a8b (diff) | |
Revert "Drop call to setPlatformScreen in QHighDpiScaling::setScreenFactor"
This reverts commit 7b2ae3faab15913e006ece25d785e6a8453dd27a.
Reason for revert: this breaks multi-monitor XCB with HighDPI.
Fixes: QTBUG-105079
Pick-to: 6.4
Change-Id: I386c9480c33d1f67b3478332c8e03fe3eeeeee39
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Fushan Wen <qydwhotmail@gmail.com>
Diffstat (limited to 'src/gui/kernel/qplatformscreen.h')
| -rw-r--r-- | src/gui/kernel/qplatformscreen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index 1d8e103606..ca828171ff 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -135,7 +135,7 @@ protected: QScopedPointer<QPlatformScreenPrivate> d_ptr; private: - friend QScreen; + friend class QScreenPrivate; }; // Qt doesn't currently support running with no platform screen |