linux/meta-qt5.git, branch dora

licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4

2014-03-15T17:54:38+00:00

The license agreement doesn't mention Nokia anymore after Qt was acquired by Digia. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa

licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider

2014-03-15T13:48:15+00:00

* Provide the license text Signed-off-by: Khem Raj Signed-off-by: Martin Jansa

qtbase-5.0.2: Fix build without -fpermissive

2014-03-14T18:55:16+00:00

* commit in newer qt is using GLint and casting to GLuint later so it doesn't have this issue: commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6 Author: Valery Volgutov Date: Tue May 21 14:18:17 2013 -0700 Fix FBO restoring in QOpenGLTextureGlyphCache * but backport to 5.0.2 is using GLuint: and causes build failure without -fpermissive: | qtbase/5.0.2-r3/qtbase-opensource-src-5.0.2/src/gui/opengl/qopengltextureglyphcache.cpp:151:51: error: invalid conversion from 'GLuint* {aka unsigned int*}' to 'GLint* {aka int*}' [-fpermissive] | glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); | ^ | /usr/include/GLES2/gl2.h:536:37: error: initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)' [-fpermissive] | GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params); | ^ * resync with version from 5.1.1 to fix this Signed-off-by: Martin Jansa

qtwayland: Fix Project ERROR: Module v8 has no public API

2014-03-11T04:21:21+00:00

Signed-off-by: Florin Sarbu Signed-off-by: Martin Jansa

qtlocation, qtsystems: Fix QT_MODULE_BRANCH

2014-03-11T04:19:54+00:00

Signed-off-by: Martin Jansa

qtwebkit-examples: add RDEPENDS for ca-certificates

2014-03-05T18:17:27+00:00

If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates. Signed-off-by: Andre McCurdy Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa

qtbase: configure with -openssl-linked instead of -openssl

2014-03-05T18:16:50+00:00

Configure qtbase with -openssl-linked (instead of -openssl) to ensure that run-time dependencies on libcryto and libssl are detected. Signed-off-by: Andre McCurdy Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa

qtbase.inc: don't force ARM_INSTRUCTION_SET to arm

2014-03-05T18:16:49+00:00

Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer seems to be required. Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon. Signed-off-by: Andre McCurdy Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa

qtbase.inc: PACKAGECONFIG[gstreamer] gst-plugins-base dependency missing

2014-02-18T13:00:27+00:00

When testing for GStreamer support, the qtbase 5.1.1 configure script tries to determine pkg-config information for both gstreamer-0.10 and gstreamer-plugins-base-0.10. If either one is unavailable then the configure test fails (with the slightly confusing error that gst/gst.h can't be found, even when the gstreamer header files are present in sysroot). Signed-off-by: Andre McCurdy

qtwebkit-examples: add missing RDEPENDS for qmlplugins

2013-11-14T09:25:39+00:00

Some examples require qtwebkit-qmlplugins (flickerview, youtubeview), and this dependency is not automatically added. Without this patch, and without manually adding qtwekbit-qmlplugins, we get errors like this: qrc:///flickrview.qml:42:1: module "QtWebKit" is not installed Signed-off-by: Nicolas Dechesne Signed-off-by: Martin Jansa