linux/meta-qt5.git - Mirror of https://code.qt.io/cgit/yocto/meta-qt5.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	qt5: refresh patches from meta-qt5/qt* repos	Martin Jansa	2018-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	* apply: 0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch also for nativesdk-qtbase as the comment says * drop unused: 0001-Add-missing-include-for-struct-timeval.patch which wasn't removed in 5.10.1 upgrade Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
*	qt: refresh remaining patches and tags in meta-qt5 repos	Martin Jansa	2018-01-16	1	-8/+5
\| \| \| \| \| \| \| \| \|	* update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
*	qtmultimedia: fix conflicting declaration error	Wenlin Kang	2016-10-26	1	-0/+103
	The error info is as the follow: \| In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, \| from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, \| from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: \| /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:474:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' \| typedef ptrdiff_t GLsizeiptr; \| ^ \| In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: \| /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:67:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr' \| typedef khronos_ssize_t GLsizeiptr; \| ^ \| In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, \| from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, \| from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, \| from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: \| /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:475:19: error: conflicting declaration 'typedef ptrdiff_t GLintptr' \| typedef ptrdiff_t GLintptr; \| ^ \| In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: \| /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:68:26: note: previous declaration as 'typedef khronos_intptr_t GLintptr' \| typedef khronos_intptr_t GLintptr; \| ^ Here, use lgl2.h instead of gl2.h and gl2ext.h, fix the "conflicting declaration" error. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>