summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch
diff options
context:
space:
mode:
authorPeter Seiderer <ps.report@gmx.net>2017-10-17 22:28:03 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-10-17 23:05:04 +0200
commit64f4f6de0c0134b6d81645e8526bde73695ab85e (patch)
tree81ca9b26f90c181dd0e6dad26fad5c71bb4b48d0 /package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch
parent42306114c3f1296435a319079c588dbd5ebe2d7f (diff)
downloadbuildroot-64f4f6de0c0134b6d81645e8526bde73695ab85e.tar.gz
buildroot-64f4f6de0c0134b6d81645e8526bde73695ab85e.zip
qt5: bump latest version to 5.9.2
qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - removed 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webchannel: - fix webchannel.js installation to target (the locatinon of the file webchannel.js changed from src/webchannel/qwebchannel.js to examples/webchannel/shared/qwebchannel.js, see commit [7]) qt5webengine: - removed 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [8]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [9], but reverted afterwards, see [10]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [11] and [12]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] https://code.qt.io/cgit/qt/qtwebchannel.git/commit/?id=e7f150abaa8e81d3e404e9631a49341a7f7623d1 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [10] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [12] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch')
-rw-r--r--package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch b/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch
deleted file mode 100644
index 6735ab63e0..0000000000
--- a/package/qt5/qt5base/5.9.1/0002-examples-fix-compile-without-opengl-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From adacb2d6701b12511c5a0e58072236da91ebf810 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Mon, 7 Aug 2017 22:54:11 +0200
-Subject: [PATCH] examples: fix compile without opengl support
-
-Compile examples/opengl only in case opengl support is available.
-
-Task-number: QTBUG-62372
-Change-Id: I742a1eb7b7639a5a722c4d5e9b4ee070b629b02e
-
-Upstream: https://codereview.qt-project.org/201947
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- examples/examples.pro | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/examples/examples.pro b/examples/examples.pro
-index a3851c6d81..d87fa2da88 100644
---- a/examples/examples.pro
-+++ b/examples/examples.pro
-@@ -14,7 +14,8 @@ qtHaveModule(concurrent): SUBDIRS += qtconcurrent
- qtHaveModule(sql): SUBDIRS += sql
- qtHaveModule(widgets): SUBDIRS += widgets
- qtHaveModule(xml): SUBDIRS += xml
--qtHaveModule(gui): SUBDIRS += gui opengl
-+qtHaveModule(gui): SUBDIRS += gui
-+qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl
-
- aggregate.files = aggregate/examples.pro
- aggregate.path = $$[QT_INSTALL_EXAMPLES]
---
-2.11.0
-
OpenPOWER on IntegriCloud