summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-26 16:54:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-26 16:18:39 +0100
commit333949a8239dfa7788b35f1059614733e11a6a25 (patch)
tree420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5/qtmultimedia
parentc0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff)
downloadmeta-qt5-333949a8239dfa7788b35f1059614733e11a6a25.tar.gz
Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia')
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
deleted file mode 100644
index fa6b5852..00000000
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 26fd6cf787a7a413d54205b8b42d16a63ed5d36a Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
5
6* It's already included in 5.5 with this commit:
7 commit 108dda7a90bd0f0337358b0db47ae55acd16dea6
8 Author: Yoann Lopes <yoann.lopes@theqtcompany.com>
9 Date: Thu Nov 20 17:54:18 2014 +0100
10 GStreamer: port to 1.0.
11* here we restore only the done_config_gstreamer variable
12 to explicitly disable it from OE build
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 qtmultimedia.pro | 26 ++++++++++++++------------
17 1 file changed, 14 insertions(+), 12 deletions(-)
18
19diff --git a/qtmultimedia.pro b/qtmultimedia.pro
20index 98bb315..287887f 100644
21--- a/qtmultimedia.pro
22+++ b/qtmultimedia.pro
23@@ -17,19 +17,21 @@ win32 {
24 contains(QT_CONFIG, alsa):qtCompileTest(alsa)
25 contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
26
27- isEmpty(GST_VERSION) {
28- contains(QT_CONFIG, gstreamer-0.10) {
29- GST_VERSION = 0.10
30- } else: contains(QT_CONFIG, gstreamer-1.0) {
31- GST_VERSION = 1.0
32+ !done_config_gstreamer {
33+ isEmpty(GST_VERSION) {
34+ contains(QT_CONFIG, gstreamer-0.10) {
35+ GST_VERSION = 0.10
36+ } else: contains(QT_CONFIG, gstreamer-1.0) {
37+ GST_VERSION = 1.0
38+ }
39+ }
40+ cache(GST_VERSION, set)
41+ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
42+ qtCompileTest(gstreamer_photography)
43+ qtCompileTest(gstreamer_encodingprofiles)
44+ qtCompileTest(gstreamer_appsrc)
45+ qtCompileTest(linux_v4l)
46 }
47- }
48- cache(GST_VERSION, set)
49- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
50- qtCompileTest(gstreamer_photography)
51- qtCompileTest(gstreamer_encodingprofiles)
52- qtCompileTest(gstreamer_appsrc)
53- qtCompileTest(linux_v4l)
54 }
55
56 qtCompileTest(resourcepolicy)