diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 15 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 1 | ||||
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 1 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 1 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection_screens.cpp | 1 |
5 files changed, 1 insertions, 18 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 247d9a8d1b..114beb6dde 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -153,8 +153,6 @@ Qt::ApplicationState QGuiApplicationPrivate::applicationState = Qt::ApplicationI Qt::HighDpiScaleFactorRoundingPolicy QGuiApplicationPrivate::highDpiScaleFactorRoundingPolicy = Qt::HighDpiScaleFactorRoundingPolicy::PassThrough; -bool QGuiApplicationPrivate::highDpiScalingUpdated = false; - QPointer<QWindow> QGuiApplicationPrivate::currentDragWindow; QList<QGuiApplicationPrivate::TabletPointData> QGuiApplicationPrivate::tabletDevicePoints; // TODO remove @@ -709,7 +707,6 @@ QGuiApplication::~QGuiApplication() QGuiApplicationPrivate::lastCursorPosition = {qreal(qInf()), qreal(qInf())}; QGuiApplicationPrivate::currentMousePressWindow = QGuiApplicationPrivate::currentMouseWindow = nullptr; QGuiApplicationPrivate::applicationState = Qt::ApplicationInactive; - QGuiApplicationPrivate::highDpiScalingUpdated = false; QGuiApplicationPrivate::currentDragWindow = nullptr; QGuiApplicationPrivate::tabletDevicePoints.clear(); } @@ -1245,13 +1242,6 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString return; } - // Many platforms have created QScreens at this point. Finish initializing - // QHighDpiScaling to be prepared for early calls to qt_defaultDpi(). - if (QGuiApplication::primaryScreen()) { - QGuiApplicationPrivate::highDpiScalingUpdated = true; - QHighDpiScaling::updateHighDpiScaling(); - } - // Create the platform theme: // 1) Fetch the platform name from the environment if present. @@ -1526,11 +1516,6 @@ void QGuiApplicationPrivate::eventDispatcherReady() createPlatformIntegration(); platform_integration->initialize(); - - // All platforms should have added screens at this point. Finish - // QHighDpiScaling initialization if it has not been done so already. - if (!QGuiApplicationPrivate::highDpiScalingUpdated) - QHighDpiScaling::updateHighDpiScaling(); } void QGuiApplicationPrivate::init() diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 57f1b1cc47..39bc5f36a4 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -233,7 +233,6 @@ public: static QWindow *currentMousePressWindow; static Qt::ApplicationState applicationState; static Qt::HighDpiScaleFactorRoundingPolicy highDpiScaleFactorRoundingPolicy; - static bool highDpiScalingUpdated; static QPointer<QWindow> currentDragWindow; // TODO remove this: QPointingDevice can store what we need directly diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index dcce42ffe0..58bb0f1cc9 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -788,6 +788,7 @@ void QWindowSystemInterface::handleScreenAdded(QPlatformScreen *ps, bool isPrima QGuiApplicationPrivate::screen_list.append(screen); QGuiApplicationPrivate::resetCachedDevicePixelRatio(); + QHighDpiScaling::updateHighDpiScaling(); emit qGuiApp->screenAdded(screen); diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 19557bfcd0..2544dd6200 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -641,7 +641,6 @@ bool QWindowsScreenManager::handleScreenChanges() if (auto theme = QWindowsTheme::instance()) // QTBUG-85734/Wine theme->refreshFonts(); } - QHighDpiScaling::updateHighDpiScaling(); return true; } diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp index 2e48826635..867bbef020 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp @@ -156,7 +156,6 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event) screen = createScreen(virtualDesktop, output, outputInfo.get()); qCDebug(lcQpaScreen) << "output" << screen->name() << "is connected and enabled"; } - QHighDpiScaling::updateHighDpiScaling(); } } else if (screen) { if (output.crtc == XCB_NONE && output.mode == XCB_NONE) { |