[sumo,meta-qt5] qtdeclarative: Backport patch to silence spurious warnings

Submitted by Khem Raj on Oct. 12, 2018, 5:48 p.m. | Patch ID: 155635

Details

Message ID 20181012174809.23154-1-raj.khem@gmail.com
State New
Delegated to: Martin Jansa
Headers show

Commit Message

Khem Raj Oct. 12, 2018, 5:48 p.m.
This helps in reducing clutter in syslogs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...1-Software-render-Fix-warnings-flood.patch | 33 +++++++++++++++++++
 recipes-qt/qt5/qtdeclarative_git.bb           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 recipes-qt/qt5/qtdeclarative/0001-Software-render-Fix-warnings-flood.patch

Patch hide | download patch | download mbox

diff --git a/recipes-qt/qt5/qtdeclarative/0001-Software-render-Fix-warnings-flood.patch b/recipes-qt/qt5/qtdeclarative/0001-Software-render-Fix-warnings-flood.patch
new file mode 100644
index 0000000..7557e53
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-Software-render-Fix-warnings-flood.patch
@@ -0,0 +1,33 @@ 
+From d4f89ae32e0f206dc3609467e9923652d0ec56d1 Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@qt.io>
+Date: Mon, 19 Feb 2018 11:51:24 +0100
+Subject: [PATCH] Software render: Fix warnings flood
+
+Add missing QPainter::end(), fixing:
+
+QBackingStore::endPaint() called with active painter on backingstore paint device
+
+Task-number: QTBUG-66452
+Change-Id: Ia00e61953528b15015b3e41ba1868e670818cf14
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+(cherry picked from commit 047f161b1a706e81034ccd8d4700a3126c16dfe4)
+Upstream-Status: Backport
+---
+ .../scenegraph/adaptations/software/qsgsoftwarerenderer.cpp      | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
+index d403884b4..ffcee5f56 100644
+--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
++++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
+@@ -156,6 +156,7 @@ void QSGSoftwareRenderer::render()
+     m_flushRegion = renderNodes(&painter);
+     qint64 renderTime = renderTimer.elapsed();
+ 
++    painter.end();
+     if (m_backingStore != nullptr)
+         m_backingStore->endPaint();
+ 
+-- 
+2.19.1
+
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index d6f468f..32e12de 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -11,6 +11,7 @@  LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
+SRC_URI += "file://0001-Software-render-Fix-warnings-flood.patch"
 
 DEPENDS += "qtbase"