xref: /OK3568_Linux_fs/yocto/meta-qt5/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 4fa69c1c5396bded20edccb2a1dd9b61f0b1140d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 2 Aug 2019 12:39:50 +0300
4Subject: [PATCH] Fix examples build error
5
6Add workaround for QTBUG-77288 which causes examples to fail to build
7
8Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
9Upstream-Status: Pending
10---
11 examples/studio3d/cppdatainput/cppdatainput.pro     | 1 +
12 examples/studio3d/dynamicelement/dynamicelement.pro | 1 +
13 examples/studio3d/qmldatainput/qmldatainput.pro     | 1 +
14 examples/studio3d/simpleqml/simpleqml.pro           | 1 +
15 4 files changed, 4 insertions(+)
16
17diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro
18index 20b5c68..bbb403a 100644
19--- a/examples/studio3d/cppdatainput/cppdatainput.pro
20+++ b/examples/studio3d/cppdatainput/cppdatainput.pro
21@@ -1,5 +1,6 @@
22 CONFIG += c++11
23 QT += widgets qml quick studio3d
24+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
25
26 target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET
27 INSTALLS += target
28diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro
29index 1b804fd..ae3c005 100644
30--- a/examples/studio3d/dynamicelement/dynamicelement.pro
31+++ b/examples/studio3d/dynamicelement/dynamicelement.pro
32@@ -1,6 +1,7 @@
33 TEMPLATE = app
34
35 QT += qml quick studio3d
36+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
37
38 SOURCES += \
39         demo.cpp \
40diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro
41index 9bafed5..496c2c1 100644
42--- a/examples/studio3d/qmldatainput/qmldatainput.pro
43+++ b/examples/studio3d/qmldatainput/qmldatainput.pro
44@@ -1,6 +1,7 @@
45 TEMPLATE = app
46
47 QT += widgets qml quick studio3d
48+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
49
50 integrity: DEFINES += USE_EMBEDDED_FONTS
51
52diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro
53index 62afa78..1a0784b 100644
54--- a/examples/studio3d/simpleqml/simpleqml.pro
55+++ b/examples/studio3d/simpleqml/simpleqml.pro
56@@ -1,6 +1,7 @@
57 TEMPLATE = app
58
59 QT += widgets qml quick studio3d
60+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
61
62 SOURCES += \
63     main.cpp
64