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