diff options
| -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 @@ | |||
| 1 | From d4f89ae32e0f206dc3609467e9923652d0ec56d1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Friedemann Kleint <Friedemann.Kleint@qt.io> | ||
| 3 | Date: Mon, 19 Feb 2018 11:51:24 +0100 | ||
| 4 | Subject: [PATCH] Software render: Fix warnings flood | ||
| 5 | |||
| 6 | Add missing QPainter::end(), fixing: | ||
| 7 | |||
| 8 | QBackingStore::endPaint() called with active painter on backingstore paint device | ||
| 9 | |||
| 10 | Task-number: QTBUG-66452 | ||
| 11 | Change-Id: Ia00e61953528b15015b3e41ba1868e670818cf14 | ||
| 12 | Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> | ||
| 13 | (cherry picked from commit 047f161b1a706e81034ccd8d4700a3126c16dfe4) | ||
| 14 | Upstream-Status: Backport | ||
| 15 | --- | ||
| 16 | .../scenegraph/adaptations/software/qsgsoftwarerenderer.cpp | 1 + | ||
| 17 | 1 file changed, 1 insertion(+) | ||
| 18 | |||
| 19 | diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp | ||
| 20 | index d403884b4..ffcee5f56 100644 | ||
| 21 | --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp | ||
| 22 | +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp | ||
| 23 | @@ -156,6 +156,7 @@ void QSGSoftwareRenderer::render() | ||
| 24 | m_flushRegion = renderNodes(&painter); | ||
| 25 | qint64 renderTime = renderTimer.elapsed(); | ||
| 26 | |||
| 27 | + painter.end(); | ||
| 28 | if (m_backingStore != nullptr) | ||
| 29 | m_backingStore->endPaint(); | ||
| 30 | |||
| 31 | -- | ||
| 32 | 2.19.1 | ||
| 33 | |||
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 = " \ | |||
| 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 13 | " | 13 | " |
| 14 | SRC_URI += "file://0001-Software-render-Fix-warnings-flood.patch" | ||
| 14 | 15 | ||
| 15 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
| 16 | 17 | ||
