5eb43c83c1
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>
65 lines
4.3 KiB
Diff
65 lines
4.3 KiB
Diff
From b4db5c6cef877b33b5e7cd5a07fe4a7e6797dcfc Mon Sep 17 00:00:00 2001
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
Date: Tue, 16 May 2017 19:47:19 +0200
|
|
Subject: [PATCH] examples: qquickviewcomparison and quickwidget needs OpenGL
|
|
support
|
|
|
|
Fixes:
|
|
|
|
main.cpp:(.text._ZN11QQmlPrivate10createIntoI6FbItemEEvPv[_ZN11QQmlPrivate10createIntoI6FbItemEEvPv]+0x18): undefined reference to `QQuickFramebufferObject::QQuickFramebufferObject(QQuickItem*)'
|
|
.obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
|
|
main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED2Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED5Ev]+0x5c): undefined reference to `vtable for QQuickFramebufferObject'
|
|
.obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
|
|
main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev]+0x64): undefined reference to `vtable for QQuickFramebufferObject'
|
|
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x48): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
|
|
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x4c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
|
|
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
|
|
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
|
|
.obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xbc): undefined reference to `QQuickFramebufferObject::releaseResources()'
|
|
.obj/moc_fbitem.o: In function `FbItem::qt_metacast(char const*)':
|
|
moc_fbitem.cpp:(.text+0x70): undefined reference to `QQuickFramebufferObject::qt_metacast(char const*)'
|
|
.obj/moc_fbitem.o: In function `FbItem::qt_metacall(QMetaObject::Call, int, void**)':
|
|
moc_fbitem.cpp:(.text+0x80): undefined reference to `QQuickFramebufferObject::qt_metacall(QMetaObject::Call, int, void**)'
|
|
.obj/moc_fbitem.o: In function `FbItem::~FbItem()':
|
|
moc_fbitem.cpp:(.text._ZN6FbItemD2Ev[_ZN6FbItemD5Ev]+0x38): undefined reference to `vtable for QQuickFramebufferObject'
|
|
.obj/moc_fbitem.o: In function `FbItem::~FbItem()':
|
|
moc_fbitem.cpp:(.text._ZN6FbItemD0Ev[_ZN6FbItemD0Ev]+0x40): undefined reference to `vtable for QQuickFramebufferObject'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0x8): undefined reference to `typeinfo for QQuickFramebufferObject'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0x58): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0x5c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0xc4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0xc8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0xcc): undefined reference to `QQuickFramebufferObject::releaseResources()'
|
|
.obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject'
|
|
|
|
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/examples/quick/quick.pro b/examples/quick/quick.pro
|
|
index 445dfb0fa..26ca0138e 100644
|
|
--- a/examples/quick/quick.pro
|
|
+++ b/examples/quick/quick.pro
|
|
@@ -36,7 +36,10 @@ qtConfig(opengl(es1|es2)?) {
|
|
# Widget dependent examples
|
|
qtHaveModule(widgets) {
|
|
SUBDIRS += embeddedinwidgets
|
|
- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
|
|
+ # OpenGL Support Required
|
|
+ qtConfig(opengl(es1|es2)?) {
|
|
+ qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
|
|
+ }
|
|
}
|
|
|
|
EXAMPLE_FILES = \
|
|
--
|
|
2.11.0
|
|
|