diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-10-12 10:48:09 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-10-15 15:20:29 +0000 |
| commit | b9ea493141a412a344d464a8dacec002c92bf73d (patch) | |
| tree | d45fae543c09f9d11e3d256f4d11ae415e0305d3 | |
| parent | c429cedc9d6babf41feb70211285662356c4125d (diff) | |
qtdeclarative: Backport patch to silence spurious warnings
This helps in reducing clutter in syslogs
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-Software-render-Fix-warnings-flood.patch | 33 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 1 |
2 files changed, 34 insertions, 0 deletions
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 00000000..7557e536 --- /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 d6f468fc..32e12de7 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" |