aboutsummaryrefslogtreecommitdiff
path: root/package/qt5/qt5declarative
diff options
context:
space:
mode:
authorGravatar Joshua Henderson <joshua.henderson@microchip.com>2017-11-02 17:01:24 -0700
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 23:12:01 +0100
commit5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc (patch)
tree0721e153b7780bdaba6d205743c830b6c8c89683 /package/qt5/qt5declarative
parent80d22997334b0ad76f488913e1159b922804c579 (diff)
downloadbuildroot-5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc.tar.gz
buildroot-5eb43c83c10aa9cd5cdf2302af0682b3d9978ecc.tar.bz2
qt5: remove Qt Quick dependency on opengl
Qt Quick should no longer depend on opengl, and instead fallback to the limited functionality software renderer as a replacement [1] when not available. [1] http://blog.qt.io/blog/2016/08/15/the-qt-quick-graphics-stack-in-qt-5-8/ Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: S├ębastien Szymanski <sebastien.szymanski@armadeus.com> Tested-by: Peter Seiderer <ps.report@gmx.net> [Thomas: drop qt5declarative patch, since we have bumped to 5.9.3, which contains the patch.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5declarative')
-rw-r--r--package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch6
-rw-r--r--package/qt5/qt5declarative/Config.in6
2 files changed, 9 insertions, 3 deletions
diff --git a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
index 875634fdb4..7959d38946 100644
--- a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
+++ b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
@@ -34,6 +34,12 @@ Fixes:
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
+
+Note:
+An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for
+backporting to this version due to license differences.
+
+---
examples/quick/quick.pro | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 5384b5f187..3a353a8326 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE
if BR2_PACKAGE_QT5DECLARATIVE
comment "quick module needs an OpenGL-capable backend"
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
config BR2_PACKAGE_QT5DECLARATIVE_QUICK
bool "quick module"
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE
- select BR2_PACKAGE_QT5BASE_OPENGL
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
+ select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
endif