Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2020-09-25 16:24:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Fri Sep 25 16:24:17 2020 rev:110 rq:835995 version:5.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2020-09-14 12:07:21.839874805 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.4249/libqt5-qtbase.changes 2020-09-25 16:26:56.683646483 +0200 @@ -1,0 +2,6 @@ +Mon Sep 21 09:55:25 UTC 2020 - Fabian Vogt <[email protected]> + +- Revert commit to fix screen geometry on startup (boo#1176750, QTBUG-86604): + * 0001-Revert-Emit-QScreen-availableG-g-eometryChanged-on-l.patch + +------------------------------------------------------------------- New: ---- 0001-Revert-Emit-QScreen-availableG-g-eometryChanged-on-l.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.HTMRmz/_old 2020-09-25 16:26:57.635647326 +0200 +++ /var/tmp/diff_new_pack.HTMRmz/_new 2020-09-25 16:26:57.639647329 +0200 @@ -66,6 +66,7 @@ # PATCH-FIX-OPENSUSE Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch Patch24: fix-fixqt4headers.patch +Patch25: 0001-Revert-Emit-QScreen-availableG-g-eometryChanged-on-l.patch # patches 1000-2000 and above from upstream 5.15 branch # # patches 2000-3000 and above from upstream qt6/dev branch # # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384 ++++++ 0001-Revert-Emit-QScreen-availableG-g-eometryChanged-on-l.patch ++++++ >From b885b4a189db2889f3f934a18a9ffc17a9c9077f Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sun, 20 Sep 2020 18:19:10 +0200 Subject: [PATCH] Revert "Emit QScreen::(availableG|g)eometryChanged() on logical DPI change" This reverts commit 370289bef68d8505b66cb27150a3f596e23c5ed3. --- src/gui/kernel/qguiapplication.cpp | 10 ++++++++-- src/gui/kernel/qscreen.cpp | 24 +++--------------------- src/gui/kernel/qscreen_p.h | 2 -- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 239a78313c..2eee145f27 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3178,7 +3178,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP updateFilteredScreenOrientation(s); } - s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged); + if (availableGeometryChanged) + emit s->availableGeometryChanged(s->availableGeometry()); + + if (geometryChanged || availableGeometryChanged) { + const auto siblings = s->virtualSiblings(); + for (QScreen* sibling : siblings) + emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); + } resetCachedDevicePixelRatio(); } @@ -3198,7 +3205,6 @@ void QGuiApplicationPrivate::processScreenLogicalDotsPerInchChange(QWindowSystem s->d_func()->logicalDpi = QDpi(e->dpiX, e->dpiY); emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch()); - s->d_func()->updateGeometriesWithSignals(); resetCachedDevicePixelRatio(); } diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index df628fcc73..d5a4b7c027 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -77,33 +77,15 @@ QScreen::QScreen(QPlatformScreen *screen) d->setPlatformScreen(screen); } -void QScreenPrivate::updateGeometriesWithSignals() -{ - const QRect oldGeometry = geometry; - const QRect oldAvailableGeometry = availableGeometry; - updateHighDpi(); - emitGeometryChangeSignals(oldGeometry != geometry, oldAvailableGeometry != availableGeometry); -} - -void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged) -{ - Q_Q(QScreen); - if (availableGeometryChanged) - emit q->availableGeometryChanged(availableGeometry); - - if (geometryChanged || availableGeometryChanged) { - const auto siblings = q->virtualSiblings(); - for (QScreen* sibling : siblings) - emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); - } -} - void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen) { Q_Q(QScreen); platformScreen = screen; platformScreen->d_func()->screen = q; orientation = platformScreen->orientation(); + geometry = platformScreen->deviceIndependentGeometry(); + availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), + QHighDpiScaling::factor(platformScreen), geometry.topLeft()); logicalDpi = QPlatformScreen::overrideDpi(platformScreen->logicalDpi()); diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 7da542c25e..e5988ff829 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -72,8 +72,6 @@ public: } void updatePrimaryOrientation(); - void updateGeometriesWithSignals(); - void emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged); QPlatformScreen *platformScreen = nullptr; -- 2.25.1
