From b9fec03db878745066f91f354f82ec9c0002f34a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 19 Jul 2013 23:28:48 +0200 Subject: [PATCH] qtbase-5.0.2: refresh patches to apply cleanly Signed-off-by: Martin Jansa --- .../0001-Add-linux-oe-g-platform.patch | 4 +- ...ow-to-set-qt.conf-from-the-outside-u.patch | 4 +- .../0003-Add-external-hostbindir-option.patch | 4 +- ...tions-temporary-remove-isEmpty-check.patch | 4 +- ...ke-is-already-built-in-qtbase-native.patch | 4 +- ...ding-a-separate-qmake-for-the-target.patch | 4 +- ...fix-default-LIBDIRS-and-INCDIRS-with.patch | 4 +- ...-qt_module-Fix-pkgconfig-replacement.patch | 4 +- ...09-qt_module-Fix-paths-in-.prl-files.patch | 4 +- ...wayland-scanner-disable-silent-rules.patch | 4 +- ...export-SYSTEM_VARIABLES-to-.qmake.va.patch | 4 +- ...Allow-to-add-extra-arguments-to-make.patch | 4 +- .../0013-Disable-mkv8snapshot.patch | 4 +- ...-device-to-be-read-from-env-variable.patch | 4 +- .../0015-qtbase-allow-build-of-examples.patch | 4 +- ...ib-to-be-specified-at-configure-time.patch | 4 +- ...017-Rename-qAbs-Function-for-timeval.patch | 4 +- ...-QOpenGLPaintDevice-sub-area-support.patch | 42 +++++++++---------- ...estoring-in-QOpenGLTextureGlyphCache.patch | 13 +++--- ...20-Use-BGRA-extension-in-bindTexture.patch | 10 ++--- 20 files changed, 66 insertions(+), 67 deletions(-) diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index 1d74b3f644..fdd96fee6f 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/16] Add linux-oe-g++ platform +Subject: [PATCH 01/22] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index e741ca1829..f59089cfec 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/16] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/22] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -32,5 +32,5 @@ index 5fb9640..6b40731 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index 2ade1790d1..ce27eb6b60 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,7 +1,7 @@ From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/16] Add -external-hostbindir option +Subject: [PATCH 03/22] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target @@ -217,5 +217,5 @@ index 22ee456..cfc6f97 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch index 572d25cba5..cd0ca88498 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/16] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/22] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value * isEmpty works correctly only with qmake variables (e.g. $$FOO - @@ -46,5 +46,5 @@ index 8a636c7..0dad97c 100644 isEmpty(MODULE):MODULE = $$TARGET -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch index b2121cf001..dd8abfa7a6 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/16] qmake is already built in qtbase-native +Subject: [PATCH 05/22] qmake is already built in qtbase-native Ported from OE by: Yu Ke Upstream-Status: Inappropriate [configuration] @@ -26,5 +26,5 @@ index 1ca5b4e..546bed2 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch index 97333149ad..43504c593e 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/16] Allow building a separate qmake for the target +Subject: [PATCH 06/22] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 0eb735c8c9..20e5e75731 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/16] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending @@ -27,5 +27,5 @@ index cfc6f97..d0e17fa 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch index dee753bbd3..83da0d2388 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/16] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -64,5 +64,5 @@ index 1132943..7fbfd8d 100644 unix|win32-g++* { -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch index b7f648394a..5687e8f1ab 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/16] qt_module: Fix paths in .prl files +Subject: [PATCH 09/22] qt_module: Fix paths in .prl files * qmake does not prefix them with QT_SYSROOT when using them so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE @@ -58,5 +58,5 @@ index 7fbfd8d..226119f 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch index 1e8bfb7e8b..f5b5338597 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/16] wayland-scanner: disable silent rules +Subject: [PATCH 10/22] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands @@ -42,5 +42,5 @@ index 90e1e0f..0750849 100644 +#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands QMAKE_EXTRA_COMPILERS += wayland-code -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 1cb7e007e0..a5e6a6efd3 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/16] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/22] configure: don't export SYSTEM_VARIABLES to .qmake.vars * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is causing issues as we need g++ to be used as linker @@ -40,5 +40,5 @@ index 546bed2..34074ee 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index 3346566c6a..60d4a5cc18 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/16] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/22] configure.prf: Allow to add extra arguments to make * sometimes we would like to add -e or define some variable and respect it from both Makefiles used in configure tests and also Makefiles to build the application @@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch index decdc50186..7f4d47e77a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ From 78b716520396b5317a8b91dbca183483bea8b1d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/16] Disable mkv8snapshot +Subject: [PATCH 13/22] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -42,5 +42,5 @@ index 34074ee..ac09bbf 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch index 306e13793a..d407deb41a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ From f8336efd143109c3478e5548360248f99b645548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/16] enables tslib device to be read from env variable +Subject: [PATCH 14/22] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -30,5 +30,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch index 15e96bd3eb..d824eed1f4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ From a21c676a69388cd8cdf0bb28184de2bee58def0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/16] qtbase: allow build of examples +Subject: [PATCH 15/22] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -45,5 +45,5 @@ index 479a16a..ca1b0c7 100644 - } } -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch index 387961b416..882d7de58a 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0016-Allow-tslib-to-be-specified-at-configure-time.patch @@ -1,7 +1,7 @@ From 665841d6c38faecbf7848c0f4bbf3b0537b6a0a1 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 26 Mar 2013 09:22:51 -0500 -Subject: [PATCH 16/16] Allow tslib to be specified at configure time. +Subject: [PATCH 16/22] Allow tslib to be specified at configure time. Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen @@ -68,5 +68,5 @@ index 078db2f..18a8295 100644 + SUBDIRS += tslib +} -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch index d6ab7637bb..78a6b48ab4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0017-Rename-qAbs-Function-for-timeval.patch @@ -1,7 +1,7 @@ From 126d2c4beff40bc51a1912a752b23c178eac59b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH 17/17] Rename qAbs Function for timeval +Subject: [PATCH 17/22] Rename qAbs Function for timeval This decouples it from qAbs which is declared as a constexpr under certain compilation flags and enables for qtbase to be compiled with @@ -40,5 +40,5 @@ index 0eee425..7a29247 100644 /* -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch index 9d581f8202..cbf4aed1f4 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 +From c2c17a3198c85366f34b24abc80b20f27307d751 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH] QOpenGLPaintDevice sub-area support +Subject: [PATCH 18/22] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -10,15 +10,15 @@ Upstream-Status: Pending Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 --- - src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ - src/gui/opengl/qopenglpaintdevice.h | 2 ++ - src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- - src/gui/opengl/qopenglpaintengine_p.h | 1 + - src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- + src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ + src/gui/opengl/qopenglpaintdevice.h | 2 ++ + src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- + src/gui/opengl/qopenglpaintengine_p.h | 1 + + src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index f0e7e49..fe9a30c 100644 +index 0b3d9dc..5f4f1c9 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate @@ -29,7 +29,7 @@ index f0e7e49..fe9a30c 100644 QSize size; QOpenGLContext *ctx; -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) +@@ -158,6 +159,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) { } @@ -42,7 +42,7 @@ index f0e7e49..fe9a30c 100644 /*! Destroys the QOpenGLPaintDevice. */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const +@@ -226,6 +233,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const return d_ptr->ctx; } @@ -55,7 +55,7 @@ index f0e7e49..fe9a30c 100644 Returns the pixel size of the paint device. diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index c05571c..01eb1bc 100644 +index 66850c7..6f8a849 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h @@ -62,12 +62,14 @@ public: @@ -72,12 +72,12 @@ index c05571c..01eb1bc 100644 + QPoint offset() const; QSize size() const; void setSize(const QSize &size); - void setDevicePixelRatio(qreal devicePixelRatio); + diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 0782e42..52afc60 100644 +index 9fd8a7a..df29159 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -1935,7 +1935,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -88,7 +88,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2023,7 +2026,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -97,7 +97,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2066,6 +2069,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -105,7 +105,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2074,14 +2078,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -123,10 +123,10 @@ index 0782e42..52afc60 100644 } diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index d51f0e5..0d4b38d 100644 +index 93e1b42..d84e8c7 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: +@@ -261,6 +261,7 @@ public: QOpenGL2PaintEngineEx* q; QOpenGLEngineShaderManager* shaderManager; QOpenGLPaintDevice* device; @@ -135,7 +135,7 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index b751629..8822faf 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) @@ -148,5 +148,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch index 96b0a71a7c..e47c7b6daa 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -1,7 +1,7 @@ -From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 +From edea45b25b50932c8c072679d36e97b3cc3c1326 Mon Sep 17 00:00:00 2001 From: Valery Volgutov Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache +Subject: [PATCH 19/22] Fix FBO restoring in QOpenGLTextureGlyphCache QOpenGLTextureGlyphCache::restoreTextureData restores FBO which was binded before restoreTextureData call. More specifically, @@ -15,13 +15,12 @@ GL_FRAMEBUFFER_BINDING query and restoring it. Upstream-Status: Backport https://codereview.qt-project.org/#change,56608 - --- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 4e20f6a..3e66bad 100644 +index 8822faf..022356a 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) @@ -42,7 +41,7 @@ index 4e20f6a..3e66bad 100644 + funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); + glViewport(pex->x, pex->y, pex->width, pex->height); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch index 6e8818376e..fb384f7619 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0020-Use-BGRA-extension-in-bindTexture.patch @@ -1,17 +1,17 @@ -From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From 87380175cdb88ceadeec5773d8bc40ec08c4e3d6 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH] Use BGRA extension in bindTexture +Subject: [PATCH 20/22] Use BGRA extension in bindTexture Upstream-Status: Pending Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 --- - src/gui/opengl/qopengltexturecache.cpp | 6 ++---- + src/gui/opengl/qopengltexturecache.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 05e9bd4..a268f23 100644 +index fffc368..11c8b59 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/src/gui/opengl/qopengltexturecache.cpp @@ -171,7 +171,7 @@ static inline void qgl_byteSwapImage(QImage &img) @@ -35,5 +35,5 @@ index 05e9bd4..a268f23 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.7.9.5 +1.8.3.2