[SCM] qtbase packaging branch, ubuntu, updated. 5.6.1+dfsg-3ubuntu3-9-gbbc3f4a
Timo Jyrinki
timo at moszumanska.debian.org
Tue Sep 13 16:12:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=bbc3f4a
The following commit has been merged in the ubuntu branch:
commit bbc3f4aca88ed97ab56abf5b32776f4d684039e0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Sep 13 16:12:23 2016 +0000
Disable QStaticText tests for now (QTBUG-55653)
---
debian/changelog | 2 +-
...educe-paint-events-when-resizing-native-w.patch | 94 ----------------------
...end-show-hide-event-to-children-on-restor.patch | 11 ++-
debian/patches/enable-tests.patch | 11 +++
debian/patches/series | 1 -
5 files changed, 20 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 80c03bd..bdcd037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,10 +14,10 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu4) UNRELEASED; urgency=medium
* debian/patches/Fix-parsing-of-tzfile-5-POSIX-rule-zone-names-with-b.patch:
- Fix parsing of rule zone names for certain time zones (LP: #1622089)
* debian/patches/Avoid-artifacts-when-hiding-or-closing-a-QOpenGLWidg.patch
- debian/patches/QtWidgets-Reduce-paint-events-when-resizing-native-w.patch
debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch:
- Fix event sending to children, hurting Oxide-Qt use on desktop
(LP: #1613670)
+ * Disable QStaticText tests for now (QTBUG-55653)
-- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 12 Sep 2016 05:42:31 +0000
diff --git a/debian/patches/QtWidgets-Reduce-paint-events-when-resizing-native-w.patch b/debian/patches/QtWidgets-Reduce-paint-events-when-resizing-native-w.patch
deleted file mode 100644
index f3d9c5d..0000000
--- a/debian/patches/QtWidgets-Reduce-paint-events-when-resizing-native-w.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From bc410cc706e107881d3ee982287441993cabb8a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16 at wp.pl>
-Date: Mon, 1 Feb 2016 11:49:02 +0100
-Subject: [PATCH] QtWidgets: Reduce paint events when resizing native widget
-
-This patch reduces paint events by removing code which sets native
-widgets dirty in QWidgetWindow::handleExposeEvent. Native widgets are
-also marked dirty in QWidgetPrivate::drawWidget, so it is enough for
-proper painting.
-
-This restores Qt4 behavior when one resize means one repaint for native
-widgets. Without this patch the native widget is marked as dirty on
-every expose event, so one repaint is from syncBackingStore and second
-(or more) is from marking the widget dirty explicitly.
-
-This patch improves performance of native widgets and it also reduces
-locks when paint event is v-synced, e.g. on OpenGL swap buffers or on
-any other technology like VDPAU, VA-API, etc.
-
-Added autotest for checking number of paint events for native widgets.
-
-Task-number: QTBUG-50796
-Change-Id: I4e1649069e2e73d15b038fd1834d0551915252ee
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint at qt.io>
----
- src/widgets/kernel/qwidgetwindow.cpp | 8 +-------
- .../kernel/qwidget_window/tst_qwidget_window.cpp | 24 ++++++++++++++++++++++
- 2 files changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
-index 5290d79..872572a 100644
---- a/src/widgets/kernel/qwidgetwindow.cpp
-+++ b/src/widgets/kernel/qwidgetwindow.cpp
-@@ -873,14 +873,8 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
- {
- if (isExposed()) {
- m_widget->setAttribute(Qt::WA_Mapped);
-- if (!event->region().isNull()) {
-- // Exposed native widgets need to be marked dirty to get them repainted correctly.
-- if (m_widget->internalWinId() && !m_widget->isWindow() && m_widget->isVisible() && m_widget->updatesEnabled()) {
-- if (QWidgetBackingStore *bs = m_widget->d_func()->maybeBackingStore())
-- bs->markDirty(event->region(), m_widget);
-- }
-+ if (!event->region().isNull())
- m_widget->d_func()->syncBackingStore(event->region());
-- }
- } else {
- m_widget->setAttribute(Qt::WA_Mapped, false);
- }
-diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
-index 27be063..3a4b563 100644
---- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
-+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
-@@ -88,6 +88,7 @@ private slots:
-
- void tst_showWithoutActivating();
- void tst_paintEventOnSecondShow();
-+ void tst_paintEventOnResize_QTBUG50796();
-
- #ifndef QT_NO_DRAGANDDROP
- void tst_dnd();
-@@ -369,6 +370,29 @@ void tst_QWidget_window::tst_paintEventOnSecondShow()
- QTRY_VERIFY(w.paintEventCount > 0);
- }
-
-+void tst_QWidget_window::tst_paintEventOnResize_QTBUG50796()
-+{
-+ const QRect availableGeo = QGuiApplication::primaryScreen()->availableGeometry();
-+
-+ QWidget root;
-+ root.setGeometry(availableGeo.width()/2 - 100, availableGeo.height()/2 - 100,
-+ 200, 200);
-+
-+ PaintTestWidget *native = new PaintTestWidget(&root);
-+ native->winId(); // We're testing native widgets
-+ native->setGeometry(10, 10, 50, 50);
-+
-+ root.show();
-+ QVERIFY(QTest::qWaitForWindowExposed(&root));
-+ QVERIFY(QTest::qWaitForWindowActive(&root));
-+ QVERIFY(native->isVisible());
-+
-+ native->paintEventCount = 0;
-+ native->resize(native->width() + 10, native->height() + 10);
-+ QTest::qWait(50); // Wait for paint events
-+ QTRY_COMPARE(native->paintEventCount, 1); // Only one paint event must occur
-+}
-+
- #ifndef QT_NO_DRAGANDDROP
-
- /* DnD test for QWidgetWindow (handleDrag*Event() functions).
---
-2.9.3
-
diff --git a/debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch b/debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch
index ad31b61..eb29867 100644
--- a/debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch
+++ b/debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch
@@ -86,7 +86,7 @@ diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwi
index 872572a..aa7bcc2 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
-@@ -871,10 +871,40 @@ void QWidgetWindow::handleDropEvent(QDropEvent *event)
+@@ -871,15 +871,45 @@ void QWidgetWindow::handleDropEvent(QDropEvent *event)
void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
{
@@ -123,12 +123,17 @@ index 872572a..aa7bcc2 100644
+
+ if (exposed) {
m_widget->setAttribute(Qt::WA_Mapped);
- if (!event->region().isNull())
+ if (!event->region().isNull()) {
+ // Exposed native widgets need to be marked dirty to get them repainted correctly.
+ if (m_widget->internalWinId() && !m_widget->isWindow() && m_widget->isVisible() && m_widget->updatesEnabled()) {
+ if (QWidgetBackingStore *bs = m_widget->d_func()->maybeBackingStore())
+ bs->markDirty(event->region(), m_widget);
+ }
- m_widget->d_func()->syncBackingStore(event->region());
+ wPriv->syncBackingStore(event->region());
+ }
} else {
m_widget->setAttribute(Qt::WA_Mapped, false);
- }
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index b7c1526..34a1835 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index d3d3bcf..6eeef61 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23794,3 +23794,14 @@ diff -urN qtbase-opensource-src-5.6.1.old/tests/auto/auto.pro qtbase-opensource-
cmake \
installed_cmake
+diff -urN qtbase-opensource-src-5.6.1.old/tests/auto/gui/text/text.pro qtbase-opensource-src-5.6.1/tests/auto/gui/text/text.pro
+--- qtbase-opensource-src-5.6.1.old/tests/auto/gui/text/text.pro 2016-05-25 15:46:17.000000000 +0000
++++ qtbase-opensource-src-5.6.1/tests/auto/gui/text/text.pro 2016-09-13 15:56:32.825931429 +0000
+@@ -8,7 +8,6 @@
+ qfontmetrics \
+ qglyphrun \
+ qrawfont \
+- qstatictext \
+ qsyntaxhighlighter \
+ qtextblock \
+ qtextcursor \
diff --git a/debian/patches/series b/debian/patches/series
index 808ea2e..25fb72b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@ Add-thorough-tests-for-QLocale-string-double-conversions.patch
Interpret-precision-128-as-shortest-double-conversio.patch
Fix-parsing-of-tzfile-5-POSIX-rule-zone-names-with-b.patch
Avoid-artifacts-when-hiding-or-closing-a-QOpenGLWidg.patch
-QtWidgets-Reduce-paint-events-when-resizing-native-w.patch
QtWidgets-Send-show-hide-event-to-children-on-restor.patch
# Debian specific.
--
qtbase packaging
More information about the pkg-kde-commits
mailing list