[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-3-8-g742f39a

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Oct 28 12:58:59 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=742f39a

The following commit has been merged in the master branch:
commit 742f39a0999835a1e8355eaf24140d44b7159afd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 28 09:58:29 2015 -0300

    Add upstream patch to avoid VLC regression.
---
 debian/changelog                                   |  5 ++++
 ..._via_WA_OutsideWSRange_for_native_widgets.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfc13e6..4a4c8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtbase-opensource-src (5.5.1+dfsg-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add upstream's
+    qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
+    to avoid invalidating the backing store (Closes: #798661).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 28 Oct 2015 09:54:53 -0300
 
 qtbase-opensource-src (5.5.1+dfsg-4) unstable; urgency=medium
diff --git a/debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch b/debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
new file mode 100644
index 0000000..45fa7df
--- /dev/null
+++ b/debian/patches/qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
@@ -0,0 +1,33 @@
+From acb4f5cfb5efa053dd2d5dcd6490d610bb1f8c0e Mon Sep 17 00:00:00 2001
+From: Ulf Hermann <ulf.hermann at theqtcompany.com>
+Date: Tue, 27 Oct 2015 15:25:42 +0100
+Subject: [PATCH] QtWidgets: Do hide/show via WA_OutsideWSRange for native
+ widgets
+
+If a native widget has a width or height of 0 we don't have to
+invalidate its backing store as that is done by the window
+system. Certain applications rely on ... interesting ... behavior
+of certain window systems in this case.
+
+Task-number: QTBUG-48321
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
+---
+ src/widgets/kernel/qwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 7734715..4286130 100644
+--- a/src/widgets/kernel/qwidget.cpp
++++ b/src/widgets/kernel/qwidget.cpp
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+ 
+     bool needsShow = false;
+ 
+-    if (q->isWindow()) {
++    if (q->isWindow() || q->windowHandle()) {
+         if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+             q->setAttribute(Qt::WA_OutsideWSRange, true);
+             if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 66c0341..9498875 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Backported stuff
 Fix-compile-error-on-big-endian.patch
 set_positionautomatic.diff
+qtwidgets_do_not-hide_show_via_WA_OutsideWSRange_for_native_widgets.patch
 
 # To be forwarded upstream
 bsd_volumeinfo.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list