diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-02 12:45:34 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-05 07:12:10 +0000 |
| commit | e0cee22dcdbf141a103175c62dae8bc0b965558e (patch) | |
| tree | 559ed565ef83ed361dd4bf0254b50d4c90b26356 /recipes-qt/qt5 | |
| parent | 9978929f1f0cc33cc57e9e9529c1cc108c80107f (diff) | |
ogl-runtime: fix build errors
Add qtquickcontrols2 dependency for the viewer and
a workaround patch for failed examples (QTBUG-77288)
Change-Id: If7481ee63cb6633bfd38f92267f87cc3ff158607
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch | 62 | ||||
| -rw-r--r-- | recipes-qt/qt5/ogl-runtime_git.bb | 3 |
2 files changed, 64 insertions, 1 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 @@ +From 4fa69c1c5396bded20edccb2a1dd9b61f0b1140d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Fri, 2 Aug 2019 12:39:50 +0300 +Subject: [PATCH] Fix examples build error + +Add workaround for QTBUG-77288 which causes examples to fail to build + +Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +--- + examples/studio3d/cppdatainput/cppdatainput.pro | 1 + + examples/studio3d/dynamicelement/dynamicelement.pro | 1 + + examples/studio3d/qmldatainput/qmldatainput.pro | 1 + + examples/studio3d/simpleqml/simpleqml.pro | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro +index 20b5c68..bbb403a 100644 +--- a/examples/studio3d/cppdatainput/cppdatainput.pro ++++ b/examples/studio3d/cppdatainput/cppdatainput.pro +@@ -1,5 +1,6 @@ + CONFIG += c++11 + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET + INSTALLS += target +diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro +index 1b804fd..ae3c005 100644 +--- a/examples/studio3d/dynamicelement/dynamicelement.pro ++++ b/examples/studio3d/dynamicelement/dynamicelement.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + SOURCES += \ + demo.cpp \ +diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro +index 9bafed5..496c2c1 100644 +--- a/examples/studio3d/qmldatainput/qmldatainput.pro ++++ b/examples/studio3d/qmldatainput/qmldatainput.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + integrity: DEFINES += USE_EMBEDDED_FONTS + +diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro +index 62afa78..1a0784b 100644 +--- a/examples/studio3d/simpleqml/simpleqml.pro ++++ b/examples/studio3d/simpleqml/simpleqml.pro +@@ -1,6 +1,7 @@ + TEMPLATE = app + + QT += widgets qml quick studio3d ++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL + + SOURCES += \ + main.cpp diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index c2009418..7d31b2a8 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ " -DEPENDS += "qtbase qtdeclarative" +DEPENDS += "qtbase qtdeclarative qtquickcontrols2" QT_MODULE_BRANCH = "2.4" QT_MODULE_BRANCH_EASTL = "master" @@ -16,6 +16,7 @@ PV = "2.4+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ + file://0001-Fix-examples-build-error.patch \ " SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" |