summaryrefslogtreecommitdiff
path: root/recipes-qt/qt4
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2016-11-03 13:34:50 +0100
committerStefan Agner <stefan.agner@toradex.com>2017-01-10 15:41:54 -0800
commit3575a065813ab031c06c6769e727a20440cfe353 (patch)
treea44f3b819f973b95e11d600b2b2d5fc7b7a0f1e4 /recipes-qt/qt4
parent5c30e02c6ffae1076f65a6a7ca65b75ca5cab2f7 (diff)
Revert "qt4: add patch which fixes 24-bit color depth"
Patch gets now applyed in meta-qt4. This reverts commit 990b54bc5cd767a2c687bae77ca1c79e40c79c0d Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'recipes-qt/qt4')
-rw-r--r--recipes-qt/qt4/qt4-embedded_%.bbappend1
-rw-r--r--recipes-qt/qt4/qt4/0001-QWS-fix-24-bit-RGB-BGR-handling.patch36
2 files changed, 0 insertions, 37 deletions
diff --git a/recipes-qt/qt4/qt4-embedded_%.bbappend b/recipes-qt/qt4/qt4-embedded_%.bbappend
index e5a43d9..64d1d2f 100644
--- a/recipes-qt/qt4/qt4-embedded_%.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_%.bbappend
@@ -1,4 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
-SRC_URI += " file://0001-QWS-fix-24-bit-RGB-BGR-handling.patch"
QT_CONFIG_FLAGS += " -depths all"
diff --git a/recipes-qt/qt4/qt4/0001-QWS-fix-24-bit-RGB-BGR-handling.patch b/recipes-qt/qt4/qt4/0001-QWS-fix-24-bit-RGB-BGR-handling.patch
deleted file mode 100644
index 45856b0..0000000
--- a/recipes-qt/qt4/qt4/0001-QWS-fix-24-bit-RGB-BGR-handling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9722a85dd2b4a7210af66e2a135fe7aded5075c7 Mon Sep 17 00:00:00 2001
-From: Stefan Agner <stefan.agner@toradex.com>
-Date: Tue, 25 Oct 2016 14:37:02 -0700
-Subject: [PATCH] QWS: fix 24 bit RGB/BGR handling
-
-Use blit_24 for default 24-bit RGB case. This makes sure Qt works
-well with frame buffer using [23:0] R:G:B (little endian) pixel
-format. See also:
-https://bugreports.qt.io/browse/QTBUG-56740
-
-Upstream-Status: Submitted
-
-Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
----
- src/gui/embedded/qscreen_qws.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
-index 407366c..a4ece07 100644
---- a/src/gui/embedded/qscreen_qws.cpp
-+++ b/src/gui/embedded/qscreen_qws.cpp
-@@ -1208,9 +1208,9 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
- #ifdef QT_QWS_DEPTH_24
- case 24:
- if (screen->pixelType() == QScreen::NormalPixel)
-- screen->d_ptr->blit = blit_qrgb888;
-- else
- screen->d_ptr->blit = blit_24;
-+ else
-+ screen->d_ptr->blit = blit_qrgb888;
- break;
- #endif
- #ifdef QT_QWS_DEPTH_18
---
-2.10.0
-