summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-06-24 10:49:59 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2019-09-23 13:30:07 +0000
commit1b2862e896e31c89459f3186b7e9fdbd64d72bdd (patch)
tree415d56e329dc4ec4c10d1782e1030800f4c48806 /recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
parenta05a041900d20a730295ad02906f1a0c31b48a86 (diff)
downloadmeta-qt5-1b2862e896e31c89459f3186b7e9fdbd64d72bdd.tar.gz
qt3d-runtime: update to ogl-runtime v2.4
Qt 3D Studio Runtime 2.x switches/upgrades to OpenGL Runtime with version update 2.3 -> 2.4. * Contains new 3rdparty submodule EASTL (Electronic Arts Standard Template Library), recipe adjusted accordingly. * format-security, examples & musl libc build issues fixed Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch')
-rw-r--r--recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
new file mode 100644
index 00000000..0d2f165f
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
@@ -0,0 +1,62 @@
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>
9---
10 examples/studio3d/cppdatainput/cppdatainput.pro | 1 +
11 examples/studio3d/dynamicelement/dynamicelement.pro | 1 +
12 examples/studio3d/qmldatainput/qmldatainput.pro | 1 +
13 examples/studio3d/simpleqml/simpleqml.pro | 1 +
14 4 files changed, 4 insertions(+)
15
16diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro
17index 20b5c68..bbb403a 100644
18--- a/examples/studio3d/cppdatainput/cppdatainput.pro
19+++ b/examples/studio3d/cppdatainput/cppdatainput.pro
20@@ -1,5 +1,6 @@
21 CONFIG += c++11
22 QT += widgets qml quick studio3d
23+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
24
25 target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET
26 INSTALLS += target
27diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro
28index 1b804fd..ae3c005 100644
29--- a/examples/studio3d/dynamicelement/dynamicelement.pro
30+++ b/examples/studio3d/dynamicelement/dynamicelement.pro
31@@ -1,6 +1,7 @@
32 TEMPLATE = app
33
34 QT += qml quick studio3d
35+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
36
37 SOURCES += \
38 demo.cpp \
39diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro
40index 9bafed5..496c2c1 100644
41--- a/examples/studio3d/qmldatainput/qmldatainput.pro
42+++ b/examples/studio3d/qmldatainput/qmldatainput.pro
43@@ -1,6 +1,7 @@
44 TEMPLATE = app
45
46 QT += widgets qml quick studio3d
47+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
48
49 integrity: DEFINES += USE_EMBEDDED_FONTS
50
51diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro
52index 62afa78..1a0784b 100644
53--- a/examples/studio3d/simpleqml/simpleqml.pro
54+++ b/examples/studio3d/simpleqml/simpleqml.pro
55@@ -1,6 +1,7 @@
56 TEMPLATE = app
57
58 QT += widgets qml quick studio3d
59+QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
60
61 SOURCES += \
62 main.cpp