summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-01 16:46:14 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-12-09 12:22:36 +0000
commitc4a0a450b4275cc3869cf389c92e86b62f09fcea (patch)
tree6705cbb48ae3d433639bad3e78e239d210e13dee /recipes-qt/qt5
parent4e113c7b8e0a7512d2f0ad306decc8b4885ef807 (diff)
downloadmeta-qt5-c4a0a450b4275cc3869cf389c92e86b62f09fcea.tar.gz
qt5: update submodules
New configuration system is now used for more modules, so add new EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure modules with -[no-]feature flags. SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1" option so that there is no build break when release branches are removed. Add recipe for QtGamepad module, it's already used by Qt3D. Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch26
-rw-r--r--recipes-qt/qt5/qt3d_git.bb21
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qt5.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb9
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb11
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch72
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch25
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb12
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb8
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb17
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch28
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb18
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb19
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch56
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb22
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch160
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch117
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb32
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb20
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch12
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
43 files changed, 128 insertions, 605 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 526a9c17..bd5ef490 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -188,4 +188,4 @@ fakeroot do_generate_qt_environment_file() {
188 188
189addtask generate_qt_environment_file after do_install before do_package 189addtask generate_qt_environment_file after do_install before do_package
190 190
191SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" 191SRCREV = "947cace7993807d173656300f4440ae5166624fe"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 2e8d887e..b19f963e 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,23 +1,24 @@
1From 19e8db58f5c344cc15aba5c0525ceddaa307d39d Mon Sep 17 00:00:00 2001 1From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 1 file changed, 6 insertions(+), 1 deletion(-) 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-)
9 10
10diff --git a/qt3d.pro b/qt3d.pro 11diff --git a/qt3d.pro b/qt3d.pro
11index 83e0ffc..9bb7690 100644 12index 2cc347a..81cdeef 100644
12--- a/qt3d.pro 13--- a/qt3d.pro
13+++ b/qt3d.pro 14+++ b/qt3d.pro
14@@ -1,4 +1,4 @@ 15@@ -1,4 +1,4 @@
15-requires(qtConfig(opengl)) 16-requires(qtConfig(opengl))
16+!tools-only:requires(qtConfig(opengl)) 17+!tools-only:requires(qtConfig(opengl))
17 18
18 load(configure) 19 CONFIG += examples_need_tools
19 qtCompileTest(assimp) 20 load(qt_parts)
20@@ -17,3 +17,8 @@ load(qt_parts) 21@@ -14,3 +14,8 @@ load(qt_parts)
21 22
22 OTHER_FILES += \ 23 OTHER_FILES += \
23 sync.profile 24 sync.profile
@@ -26,3 +27,14 @@ index 83e0ffc..9bb7690 100644
26+ sub_tools.depends -= sub_src 27+ sub_tools.depends -= sub_src
27+ SUBDIRS = sub_tools 28+ SUBDIRS = sub_tools
28+} 29+}
30diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
31index 8ba2d9a..e973d93 100644
32--- a/src/3rdparty/assimp/assimp_dependency.pri
33+++ b/src/3rdparty/assimp/assimp_dependency.pri
34@@ -1,5 +1,5 @@
35 QT_FOR_CONFIG += 3dcore-private
36-qtConfig(system-assimp):!if(cross_compile:host_build) {
37+!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) {
38 QMAKE_USE_PRIVATE += assimp
39 } else {
40 include(assimp.pri)
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 2922173d..eb26a44b 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -18,15 +18,22 @@ SRC_URI += " \
18PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
19PACKAGECONFIG_class-native ??= "tools-only" 19PACKAGECONFIG_class-native ??= "tools-only"
20PACKAGECONFIG_class-nativesdk ??= "tools-only" 20PACKAGECONFIG_class-nativesdk ??= "tools-only"
21PACKAGECONFIG[tools-only] = "CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib" 21PACKAGECONFIG[tools-only] = ""
22PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp"
23PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
22 24
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
24 26
25FILES_${PN}-qmlplugins += " \ 27EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}"
26 ${OE_QMAKE_PATH_QML}/*/*/*.bez \ 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}"
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 29
28" 30do_configure_prepend() {
31 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG
32 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \
33 ${S}/src/input/frontend/frontend.pri \
34 ${S}/src/quick3d/imports/input/importsinput.pro
35}
29 36
30SRCREV = "6e8e228852f0930638b0e0272509809a0fb9ab42" 37SRCREV = "a2c6c81f5c67390629a313ff7ba985d0967ca1fa"
31 38
32BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index a1dd16a9..f8649533 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,7 +3,7 @@
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.8" 5QT_MODULE_BRANCH ?= "5.8"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
9SRC_URI = " \ 9SRC_URI = " \
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index a01c490c..90d7896f 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -6,7 +6,9 @@ inherit qmake5
6PACKAGECONFIG_OPENSSL ?= "openssl" 6PACKAGECONFIG_OPENSSL ?= "openssl"
7 7
8PACKAGECONFIG[examples] = "" 8PACKAGECONFIG[examples] = ""
9PACKAGECONFIG[tests] = ""
9EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" 10EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}"
11EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}"
10 12
11# we don't want conflicts with qt4 13# we don't want conflicts with qt4
12OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" 14OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index b8dc6f3b..22ca3d5c 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -105,4 +105,4 @@ do_install() {
105 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 105 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
106} 106}
107 107
108SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" 108SRCREV = "947cace7993807d173656300f4440ae5166624fe"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 242aaf01..4297ec76 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -40,10 +40,9 @@ RDEPENDS_${PN}-tools += "perl"
40 40
41PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 41PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
42PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 42PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
43PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb', '', d)}" 43PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}"
44PACKAGECONFIG_FONTS ?= "" 44PACKAGECONFIG_FONTS ?= ""
45PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 45PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
46PACKAGECONFIG_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
47PACKAGECONFIG_DISTRO ?= "" 46PACKAGECONFIG_DISTRO ?= ""
48# Either release or debug, can be overridden in bbappends 47# Either release or debug, can be overridden in bbappends
49PACKAGECONFIG_RELEASE ?= "release" 48PACKAGECONFIG_RELEASE ?= "release"
@@ -60,7 +59,6 @@ PACKAGECONFIG ?= " \
60 ${PACKAGECONFIG_X11} \ 59 ${PACKAGECONFIG_X11} \
61 ${PACKAGECONFIG_FONTS} \ 60 ${PACKAGECONFIG_FONTS} \
62 ${PACKAGECONFIG_SYSTEM} \ 61 ${PACKAGECONFIG_SYSTEM} \
63 ${PACKAGECONFIG_MULTIMEDIA} \
64 ${PACKAGECONFIG_DISTRO} \ 62 ${PACKAGECONFIG_DISTRO} \
65" 63"
66 64
@@ -91,6 +89,7 @@ PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre"
91PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm" 89PACKAGECONFIG[eglfs] = "-eglfs,-no-eglfs,drm"
92PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl" 90PACKAGECONFIG[gl] = "-opengl desktop,,virtual/libgl"
93PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl" 91PACKAGECONFIG[gles2] = "-opengl es2,,virtual/libgles2 virtual/egl"
92PACKAGECONFIG[no-opengl] = "-no-opengl"
94PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" 93PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib"
95PACKAGECONFIG[cups] = "-cups,-no-cups,cups" 94PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
96PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" 95PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
@@ -122,8 +121,6 @@ PACKAGECONFIG[gbm] = "-gbm,-no-gbm,gbm"
122PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 121PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
123PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 122PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
124PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 123PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
125PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
126PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
127PACKAGECONFIG[widgets] = "-widgets,-no-widgets" 124PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
128PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" 125PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
129PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" 126PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
@@ -182,4 +179,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
182 179
183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 180RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
184 181
185SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" 182SRCREV = "947cace7993807d173656300f4440ae5166624fe"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index d45c9d4f..2ad8b187 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "6c5121eab75e61f807c2df0f14988317f220b945" 13SRCREV = "c8cf923ee5076db1b37fdd012994adf72ce6445e"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index a1477b1a..1b969f33 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "15447eed96be05b2607fa23c6455c37ab1990282" 11SRCREV = "38386fda213cd50e3a3284b69ae15d5f33a7e049"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 5fad9844..219f78a7 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,13 +19,8 @@ DEPENDS += "qtbase qtdeclarative"
19inherit bluetooth 19inherit bluetooth
20 20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
22PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" 22PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
23 23
24EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 24EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
25 25
26do_configure_prepend() { 26SRCREV = "78c593fcdd9cdfa5804404f2120768544c01c7f5"
27 # disable bluez test if it isn't enabled by PACKAGECONFIG
28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
29}
30
31SRCREV = "515ff5b0f9a2245a13cec6f2d37edd1715cdae8c"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 8eb56ae0..7d6a51fc 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "96086b01a3e732cfb58cfd6e15a8dfc53550eb13" 11SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
deleted file mode 100644
index b71e3a4b..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 0d742f34ef91fb4e35c68b1274f68daef594f0c3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450
15Signed-off-by: Eric Bénard <eric@eukrea.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 examples/qmltest/qmltest/qmltest.pro | 2 +-
19 tests/auto/qml/qjsengine/qjsengine.pro | 2 +-
20 tests/auto/qmltest/qmltest.pro | 1 +
21 tools/qmltestrunner/qmltestrunner.pro | 2 +-
22 4 files changed, 4 insertions(+), 3 deletions(-)
23
24diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
25index b5893c5..1b00e6c 100644
26--- a/examples/qmltest/qmltest/qmltest.pro
27+++ b/examples/qmltest/qmltest/qmltest.pro
28@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
29 # This code exists solely for the purpose of building this example
30 # inside the examples/ hierarchy.
31
32-QT += qml qmltest
33+QT += qml qmltest quick
34
35 macx: CONFIG -= app_bundle
36
37diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
38index c9d78e2..5861613 100644
39--- a/tests/auto/qml/qjsengine/qjsengine.pro
40+++ b/tests/auto/qml/qjsengine/qjsengine.pro
41@@ -1,6 +1,6 @@
42 CONFIG += testcase
43 TARGET = tst_qjsengine
44-QT += qml qml-private widgets testlib gui-private
45+QT += qml qml-private widgets testlib gui-private quick
46 macx:CONFIG -= app_bundle
47 SOURCES += tst_qjsengine.cpp
48 RESOURCES += qjsengine.qrc
49diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
50index 52fd6bf..843cae6 100644
51--- a/tests/auto/qmltest/qmltest.pro
52+++ b/tests/auto/qmltest/qmltest.pro
53@@ -4,6 +4,7 @@ CONFIG += qmltestcase
54 CONFIG += console
55 SOURCES += tst_qmltest.cpp
56
57+QT += quick
58
59 importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests
60
61diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
62index 1bb913e..56f2dd5 100644
63--- a/tools/qmltestrunner/qmltestrunner.pro
64+++ b/tools/qmltestrunner/qmltestrunner.pro
65@@ -1,6 +1,6 @@
66 SOURCES += main.cpp
67
68-QT += qml qmltest
69+QT += qml qmltest quick
70 CONFIG += no_import_scan
71
72 load(qt_tool)
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
deleted file mode 100644
index d0d0f8e0..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 6b1cef42f828cd2374739aa7e3b3800d579315d6 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:38:58 -0400
4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been
5 declared error
6
7Upstream-Status: Pending
8
9Signed-off-by: Denys Dmytriyenko <denys@ti.com>
10---
11 examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
15index 5b86c93..e77514e 100644
16--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
17+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
18@@ -44,6 +44,7 @@
19 #include <QWidget>
20 #include <QQuickWidget>
21 #include <QQuickView>
22+#include <QCoreApplication>
23
24 QT_FORWARD_DECLARE_CLASS(QRadioButton)
25 QT_FORWARD_DECLARE_CLASS(QCheckBox)
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 6912ea87..bf25d078 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,13 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRC_URI += " \
20 file://0001-qmltestexample-fix-link.patch \
21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
22"
23
24EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt"
25
26PACKAGECONFIG ??= "qtxmlpatterns" 19PACKAGECONFIG ??= "qtxmlpatterns"
27PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" 20PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
28 21
@@ -30,9 +23,6 @@ do_configure_prepend() {
30 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG 23 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG
31 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro 24 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro
32 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro 25 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro
33
34 #set the path for syncqt properly
35 echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache
36} 26}
37 27
38do_install_append_class-nativesdk() { 28do_install_append_class-nativesdk() {
@@ -42,6 +32,6 @@ do_install_append_class-nativesdk() {
42 32
43EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
44 34
45SRCREV = "9d085bf0024c442b14b7d22bc629574058176deb" 35SRCREV = "fc5c77e371867cf6be8e270e452e21e5ac338283"
46 36
47BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index c2455bf1..2f32a884 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ 10 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
11" 11"
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
13DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 13DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14 14
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "b0ad5907f480307853f7ac951bacfaa61dcbd94e" 16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
17 17
18do_install_append() { 18do_install_append() {
19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then 19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
new file mode 100644
index 00000000..2ecbd5af
--- /dev/null
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -0,0 +1,17 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
7 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
8"
9
10DEPENDS += "qtbase qtxmlpatterns qtdeclarative"
11
12PACKAGECONFIG ??= "sdl2"
13PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16
17SRCREV = "dc599eca071d545aab3f6a5c854911cac9585a57"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index d0a31caa..a5660c51 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative"
19 19
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
21 21
22SRCREV = "8b5cb6185a014eb65150bef11aebdecb6a723aef" 22SRCREV = "863682782bd7ba3edc33d3e13938437af0637320"
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
deleted file mode 100644
index 03432c9e..00000000
--- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 7eb3fddc70871048f170211a88194c8cdeeca4dd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 4 Aug 2014 19:19:05 +0200
4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 qtimageformats.pro | 8 ++++----
9 1 file changed, 4 insertions(+), 4 deletions(-)
10
11diff --git a/qtimageformats.pro b/qtimageformats.pro
12index 8382e5c..63d13ce 100644
13--- a/qtimageformats.pro
14+++ b/qtimageformats.pro
15@@ -1,9 +1,9 @@
16 requires(qtHaveModule(gui))
17
18 load(configure)
19-qtCompileTest(jasper)
20-qtCompileTest(libmng)
21-qtCompileTest(libtiff)
22-qtCompileTest(libwebp)
23+OE_JASPER_ENABLED:qtCompileTest(jasper)
24+OE_LIBMNG_ENABLED:qtCompileTest(libmng)
25+OE_LIBTIFF_ENABLED:qtCompileTest(libtiff)
26+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp)
27
28 load(qt_parts)
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 88ca6840..d073730c 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -16,20 +16,14 @@ LIC_FILES_CHKSUM = " \
16" 16"
17 17
18DEPENDS += "qtbase" 18DEPENDS += "qtbase"
19ALLOW_EMPTY_${PN} = "1"
20
21SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch"
22 19
23PACKAGECONFIG ?= "libtiff" 20PACKAGECONFIG ?= "libtiff"
24# Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced 21# Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced
25PACKAGECONFIG[jasper] = ",,jasper" 22PACKAGECONFIG[jasper] = ",CONFIG+=done_config_jasper,jasper"
26PACKAGECONFIG[libmng] = ",,libmng" 23PACKAGECONFIG[libmng] = ",CONFIG+=done_config_libmng,libmng"
27PACKAGECONFIG[libtiff] = ",,tiff" 24PACKAGECONFIG[libtiff] = ",CONFIG+=done_config_libtiff,tiff"
28PACKAGECONFIG[libwebp] = ",,libwebp" 25PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
29 26
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
34 28
35SRCREV = "99d9e0c527ad91f186628ece1c8b3a5ec07f7add" 29SRCREV = "65db62e4398c5ddfba1ea7825987b3f4ab04369e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 49579dd6..40003094 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -14,19 +14,10 @@ LIC_FILES_CHKSUM = " \
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
17# older geoclue 0.x is needed 17# older geoclue 0.12.99 is needed
18PACKAGECONFIG[geoclue] = "OE_GEOCLUE_ENABLED,,gconf geoclue" 18PACKAGECONFIG[geoclue] = ",,geoclue"
19PACKAGECONFIG[gypsy] = "OE_GYPSY_ENABLED,,gconf gypsy" 19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
20 20
21do_configure_prepend() { 21EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
22 # disable geoclue tests if it isn't enabled by PACKAGECONFIG
23 sed -i -e 's/^\(qtCompileTest(geoclue)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro
24 sed -i -e 's/^\(qtCompileTest(geoclue-satellite)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro
25 # disable gypsy test if it isn't enabled by PACKAGECONFIG
26 sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro
27}
28 22
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 23SRCREV = "ba9b7b9ef674d93680070f6c4bb1053d0d2325dd"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31
32SRCREV = "8aabdb0975c3532324d299dfa62aa333a56d2d3b"
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)
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 4fe2d8e6..9f8701d1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -18,25 +18,19 @@ DEPENDS += "qtdeclarative"
18 18
19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 20 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
21PACKAGECONFIG[alsa] = ",,alsa-lib" 21PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
22PACKAGECONFIG[pulseaudio] = ",,pulseaudio" 22PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
23PACKAGECONFIG[openal] = ",,openal-soft" 23PACKAGECONFIG[openal] = "-feature-openal,-no-feature-openal,openal-soft"
24PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 24PACKAGECONFIG[gstreamer] = "-gstreamer 1.0,,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
25PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base gst-plugins-bad" 25PACKAGECONFIG[gstreamer010] = "-gstreamer 0.10,,gstreamer gst-plugins-base gst-plugins-bad"
26 26
27EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '', 'CONFIG+=done_config_alsa', d)}" 27EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', '', 'CONFIG+=done_config_pulseaudio', d)}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'openal', '', 'CONFIG+=done_config_openal', d)}"
30 28
31# Handles GStreamer support
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'GST_VERSION=1.0', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'GST_VERSION=0.10', '', d)}"
34# Disable GStreamer if completely disabled 29# Disable GStreamer if completely disabled
35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" 30EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
36 31
37SRC_URI += "\ 32SRC_URI += "\
38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
39 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
40" 34"
41 35
42SRCREV = "0cb4dc5c1fded81b4f47945b51b8de0b0151bf67" 36SRCREV = "77567bad82081ffb166578bdeac52fb1f2dce464"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index b93cd6c7..7b659341 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "e09a8591990e5281929ca2a7bb180bb3a35556ba" 13SRCREV = "661bba4f11666d5d9018a6a1d16a71c324bdf123"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 54aaad4f..dbba0f27 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -21,4 +21,4 @@ SRC_URI += " \
21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
22" 22"
23 23
24SRCREV = "3bc99dd69fb9099a13dd94ebd081dba5c68d6def" 24SRCREV = "84b48cadc8f68d57d1a750e6aec690f46582e0c5"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2058e229..1ee6e0b1 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "89e980b8e0007a3615d01286d1f590fb95757233" 28SRCREV = "dcc9a3fdbf14e14a40bed106a0af93e7134690d4"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index d1ea63f6..c8a8b120 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
15 15
16SRCREV = "8065e461421ea17a942ea09d67aaa053a136a54e" 16SRCREV = "07bf3002fecd493a47bfb97420d3c3fbe6ee1458"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 5b903950..2d650bc0 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "8e4bd5bcfd6093c980866a6b258311e7d8ae5bbf" 14SRCREV = "fb63280f12042be341df9de55aa94ca23e991fe9"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index e2917b46..10c2e243 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "e2a658a2472d9fa710c251a065f488bae981c0ae" 18SRCREV = "4e667fa7f88144e198692d9794baacc86bb4eb98"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 9e0c4fb3..76729b64 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "5a00abdefd1c050aae8760dfc01ae5e3631077aa" 15SRCREV = "51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765"
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
deleted file mode 100644
index 46ab795d..00000000
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ /dev/null
@@ -1,160 +0,0 @@
1From 68ecc4f25789321fc29ec9e4981fcfa27e706f1c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 examples/examples.pro | 3 ++-
15 src/designer/src/src.pro | 18 ++++++++++--------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 16 +++++++++-------
18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 35 insertions(+), 28 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 69365d1..da7b38b 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,4 +1,5 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
29+qtHaveModule(widgets): SUBDIRS += linguist uitools
30
31 winrt: SUBDIRS -= assistant designer
32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
33index 6915e34..3ff2eca 100644
34--- a/src/designer/src/src.pro
35+++ b/src/designer/src/src.pro
36@@ -1,13 +1,15 @@
37 TEMPLATE = subdirs
38
39-SUBDIRS = \
40- uiplugin \
41- uitools \
42- lib \
43- components \
44- designer
45+!linguistonly {
46+ SUBDIRS = \
47+ uiplugin \
48+ lib \
49+ components \
50+ designer
51+}
52+SUBDIRS += uitools
53
54-contains(QT_CONFIG, shared): SUBDIRS += plugins
55+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
56
57 uitools.depends = uiplugin
58 lib.depends = uiplugin
59@@ -15,7 +17,7 @@ components.depends = lib
60 designer.depends = components
61 plugins.depends = lib
62
63-qtNomakeTools( \
64+!linguistonly:qtNomakeTools( \
65 lib \
66 components \
67 designer \
68diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
69index 3a70580..a977878 100644
70--- a/src/linguist/linguist.pro
71+++ b/src/linguist/linguist.pro
72@@ -3,7 +3,7 @@ SUBDIRS = \
73 lrelease \
74 lupdate \
75 lconvert
76-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
77+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
78
79 qtNomakeTools( \
80 linguist \
81diff --git a/src/src.pro b/src/src.pro
82index 387d54f..56b7d0c 100644
83--- a/src/src.pro
84+++ b/src/src.pro
85@@ -4,19 +4,21 @@ qtHaveModule(widgets) {
86 no-png {
87 message("Some graphics-related tools are unavailable without PNG support")
88 } else {
89- SUBDIRS = assistant \
90+ !linguistonly {
91+ SUBDIRS = assistant \
92 pixeltool \
93- qtestlib \
94- designer
95+ qtestlib
96+ }
97+ SUBDIRS += designer
98
99 linguist.depends = designer
100 }
101 }
102
103 SUBDIRS += linguist \
104- qdoc \
105 qtplugininfo
106-if(!android|android_app):!ios: SUBDIRS += qtpaths
107+!linguistonly: SUBDIRS += qdoc
108+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths
109
110 mac {
111 SUBDIRS += macdeployqt
112@@ -26,11 +28,11 @@ android {
113 SUBDIRS += androiddeployqt
114 }
115
116-qtHaveModule(dbus): SUBDIRS += qdbus
117+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
118
119-win32|winrt:SUBDIRS += windeployqt
120-winrt:SUBDIRS += winrtrunner
121-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
122+!linguistonly:win32|winrt:SUBDIRS += windeployqt
123+!linguistonly:winrt:SUBDIRS += winrtrunner
124+!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
125
126 qtNomakeTools( \
127 pixeltool \
128diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
129index 20b5fec..8a42d1f 100644
130--- a/tests/auto/auto.pro
131+++ b/tests/auto/auto.pro
132@@ -1,15 +1,17 @@
133 TEMPLATE=subdirs
134-SUBDIRS=\
135- linguist \
136- qhelpcontentmodel \
137- qhelpenginecore \
138- qhelpgenerator \
139- qhelpindexmodel \
140- qhelpprojectdata \
141- cmake \
142- installed_cmake \
143- qtdiag \
144- windeployqt
145+!linguistonly {
146+ SUBDIRS=\
147+ linguist \
148+ qhelpcontentmodel \
149+ qhelpenginecore \
150+ qhelpgenerator \
151+ qhelpindexmodel \
152+ qhelpprojectdata \
153+ cmake \
154+ installed_cmake \
155+ qtdiag \
156+ windeployqt
157+}
158
159 installed_cmake.depends = cmake
160
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 3d77ec70..c3f653d6 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32 32
33SRCREV = "b8113e90e2a1d9ea38a478990a93615f432ac35b" 33SRCREV = "c3b5247161eff3b521381a9ada14b180e330a037"
34 34
35BBCLASSEXTEND = "native nativesdk" 35BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index c2592448..f502d2a1 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "64f3b105fb67d813512b287be6fdaec409d6d943" 117SRCREV = "3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index c93a9bd5..e538a224 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -48,4 +48,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
48 48
49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
50 50
51SRCREV = "947a55149aec2724158934efde1be496b3c5e04e" 51SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31"
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
deleted file mode 100644
index 982c60c5..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
+++ /dev/null
@@ -1,117 +0,0 @@
1From 4fd9d8ce8289e0b7d5ecf01c7cce89d20d93b0d4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <dachaac@gmail.com>
3Date: Sun, 18 Sep 2016 11:51:59 +0300
4Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are
5 disabled.
6
7QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL,
8QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and
9QT_NO_SESSIONMANAGER, these has to be taken into account when compiling
10QtWayland.
11---
12 src/client/qwaylandintegration.cpp | 17 ++++++++++++++++-
13 src/client/qwaylandintegration_p.h | 8 ++++++++
14 2 files changed, 24 insertions(+), 1 deletion(-)
15
16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17index 48517fc..9ea8647 100644
18--- a/src/client/qwaylandintegration.cpp
19+++ b/src/client/qwaylandintegration.cpp
20@@ -45,7 +45,9 @@
21 #include "qwaylandinputcontext_p.h"
22 #include "qwaylandshmbackingstore_p.h"
23 #include "qwaylandnativeinterface_p.h"
24+#ifndef QT_NO_CLIPBOARD
25 #include "qwaylandclipboard_p.h"
26+#endif
27 #include "qwaylanddnd_p.h"
28 #include "qwaylandwindowmanagerintegration_p.h"
29 #include "qwaylandscreen_p.h"
30@@ -63,7 +65,9 @@
31 #include <QSocketNotifier>
32
33 #include <qpa/qplatforminputcontextfactory_p.h>
34+#ifndef QT_NO_ACCESSIBILITY
35 #include <qpa/qplatformaccessibility.h>
36+#endif
37 #include <qpa/qplatforminputcontext.h>
38
39 #include "qwaylandhardwareintegration_p.h"
40@@ -132,9 +136,12 @@ QWaylandIntegration::QWaylandIntegration()
41 {
42 initializeInputDeviceIntegration();
43 mDisplay = new QWaylandDisplay(this);
44+#ifndef QT_NO_CLIPBOARD
45 mClipboard = new QWaylandClipboard(mDisplay);
46+#endif
47+#ifndef QT_NO_DRAGANDDROP
48 mDrag = new QWaylandDrag(mDisplay);
49-
50+#endif
51 QString icStr = QPlatformInputContextFactory::requested();
52 if (!icStr.isNull()) {
53 mInputContext.reset(QPlatformInputContextFactory::create(icStr));
54@@ -153,8 +160,12 @@ QWaylandIntegration::QWaylandIntegration()
55
56 QWaylandIntegration::~QWaylandIntegration()
57 {
58+#ifndef QT_NO_DRAGANDDROP
59 delete mDrag;
60+#endif
61+#ifndef QT_NO_CLIPBOARD
62 delete mClipboard;
63+#endif
64 #ifndef QT_NO_ACCESSIBILITY
65 delete mAccessibility;
66 #endif
67@@ -230,15 +241,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
68 return mFontDb;
69 }
70
71+#ifndef QT_NO_CLIPBOARD
72 QPlatformClipboard *QWaylandIntegration::clipboard() const
73 {
74 return mClipboard;
75 }
76+#endif
77
78+#ifndef QT_NO_DRAGANDDROP
79 QPlatformDrag *QWaylandIntegration::drag() const
80 {
81 return mDrag;
82 }
83+#endif
84
85 QPlatformInputContext *QWaylandIntegration::inputContext() const
86 {
87diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
88index 9a49902..082e0c8 100644
89--- a/src/client/qwaylandintegration_p.h
90+++ b/src/client/qwaylandintegration_p.h
91@@ -86,9 +86,13 @@ public:
92
93 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
94
95+#ifndef QT_NO_CLIPBOARD
96 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
97+#endif
98
99+#ifndef QT_NO_DRAGANDDROP
100 QPlatformDrag *drag() const Q_DECL_OVERRIDE;
101+#endif
102
103 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
104
105@@ -126,8 +130,12 @@ private:
106 QWaylandShellIntegration *createShellIntegration(const QString& interfaceName);
107
108 QPlatformFontDatabase *mFontDb;
109+#ifndef QT_NO_CLIPBOARD
110 QPlatformClipboard *mClipboard;
111+#endif
112+#ifndef QT_NO_DRAGANDDROP
113 QPlatformDrag *mDrag;
114+#endif
115 QWaylandDisplay *mDisplay;
116 QPlatformNativeInterface *mNativeInterface;
117 QScopedPointer<QPlatformInputContext> mInputContext;
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index c64a92f1..c38d5f0c 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -16,13 +16,11 @@ LIC_FILES_CHKSUM = " \
16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 16 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
17" 17"
18 18
19#FIXME: xkb should be optional; we add it here to fix the build error without it
20# (https://bugreports.qt.io/browse/QTBUG-54851)
21PACKAGECONFIG ?= " \ 19PACKAGECONFIG ?= " \
22 compositor-api \ 20 wayland-client \
21 wayland-server \
23 wayland-egl \ 22 wayland-egl \
24 xkb \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcompositor xkb glx', '', d)} \
26" 24"
27PACKAGECONFIG_class-native ?= "" 25PACKAGECONFIG_class-native ?= ""
28PACKAGECONFIG_class-nativesdk ?= "" 26PACKAGECONFIG_class-nativesdk ?= ""
@@ -31,21 +29,17 @@ QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner"
31B_class-native = "${SEPB}/src/qtwaylandscanner" 29B_class-native = "${SEPB}/src/qtwaylandscanner"
32B_class-nativesdk = "${SEPB}/src/qtwaylandscanner" 30B_class-nativesdk = "${SEPB}/src/qtwaylandscanner"
33 31
34PACKAGECONFIG[compositor-api] = "CONFIG+=wayland-compositor" 32PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client"
35PACKAGECONFIG[xcompositor] = "CONFIG+=config_xcomposite CONFIG+=done_config_xcomposite,CONFIG+=done_config_xcomposite,libxcomposite" 33PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server"
36PACKAGECONFIG[glx] = "CONFIG+=config_glx CONFIG+=done_config_glx,CONFIG+=done_config_glx,virtual/mesa" 34PACKAGECONFIG[xcomposite-egl] = "-feature-xcomposite-egl,-no-feature-xcomposite-egl,libxcomposite"
37PACKAGECONFIG[xkb] = "CONFIG+=config_xkbcommon CONFIG+=done_config_xkbcommon,CONFIG+=done_config_xkbcommon,libxkbcommon xproto" 35PACKAGECONFIG[xcomposite-glx] = "-feature-xcomposite-glx,-no-feature-xcomposite-glx,virtual/mesa"
38PACKAGECONFIG[wayland-egl] = "CONFIG+=config_wayland_egl CONFIG+=done_config_wayland_egl,CONFIG+=done_config_wayland_egl,virtual/egl" 36PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,no-feature-wayland-egl,virtual/egl"
39PACKAGECONFIG[brcm-egl] = "CONFIG+=config_brcm_egl CONFIG+=done_config_brcm_egl,CONFIG+=done_config_brcm_egl,virtual/egl" 37PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl"
40PACKAGECONFIG[drm-egl] = "CONFIG+=config_drm_egl_server CONFIG+=done_config_drm_egl_server,CONFIG+=done_config_drm_egl_server,libdrm virtual/egl" 38PACKAGECONFIG[drm-egl-server] = "-feature-drm-egl-server,-no-feature-drm-egl-server,libdrm virtual/egl"
41PACKAGECONFIG[libhybris-egl] = "CONFIG+=config_libhybris_egl_server CONFIG+=done_config_libhybris_egl_server,CONFIG+=done_config_libhybris_egl_server,libhybris" 39PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature-libhybris-egl-server,libhybris"
42 40
43EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 41EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
44 42
45SRC_URI += " \ 43SRCREV = "545ef2e21d74128733f3b9b117d7c6024826cbb5"
46 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
47"
48
49SRCREV = "3443483c9efdcfbfe049f96c83f83a5bf1d81e61"
50 44
51BBCLASSEXTEND =+ "native nativesdk" 45BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index a108a221..2625b3f5 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
19 19
20SRCREV = "bf66a8531e0ada3ade7e873bc3fae824237acd3e" 20SRCREV = "8cc9153f413c36d505794adfaca4f4724692fa81"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 4152ef0a..7dc37a92 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -20,14 +20,9 @@ DEPENDS += " \
20 libdrm fontconfig pixman openssl pango cairo icu pciutils \ 20 libdrm fontconfig pixman openssl pango cairo icu pciutils \
21 libcap \ 21 libcap \
22 gperf-native \ 22 gperf-native \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
23" 24"
24 25
25# when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES),
26# qtwebengine will have additional dependencies:
27# contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
28# xscreensaver isn't covered in qtbase DEPENDS
29DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}"
30
31DEPENDS += "yasm-native" 26DEPENDS += "yasm-native"
32EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" 27EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm"
33 28
@@ -52,6 +47,7 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
52COMPATIBLE_MACHINE_armv6 = "(.*)" 47COMPATIBLE_MACHINE_armv6 = "(.*)"
53COMPATIBLE_MACHINE_armv7a = "(.*)" 48COMPATIBLE_MACHINE_armv7a = "(.*)"
54COMPATIBLE_MACHINE_armv7ve = "(.*)" 49COMPATIBLE_MACHINE_armv7ve = "(.*)"
50COMPATIBLE_MACHINE_aarch64 = "(.*)"
55 51
56inherit qmake5 52inherit qmake5
57inherit gettext 53inherit gettext
@@ -65,10 +61,6 @@ def gettext_oeconf(d):
65require qt5.inc 61require qt5.inc
66require qt5-git.inc 62require qt5-git.inc
67 63
68# To avoid trouble start with not separated build directory
69SEPB = "${S}"
70B = "${SEPB}"
71
72export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" 64export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
73 65
74do_configure() { 66do_configure() {
@@ -86,7 +78,7 @@ do_configure() {
86 78
87 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 79 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
88 # arguments here 80 # arguments here
89 ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \ 81 ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} ${S} \
90 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ 82 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \
91 QMAKE_LINK="${OE_QMAKE_LINK}" \ 83 QMAKE_LINK="${OE_QMAKE_LINK}" \
92 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ 84 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \
@@ -123,13 +115,11 @@ SRC_URI += " \
123 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 115 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
124" 116"
125 117
126SRCREV_qtwebengine = "ac3d8780a0293793dbc3cd47b96aab4613dec5d9" 118SRCREV_qtwebengine = "a79fd91391c489ea1cd7baf717778b75e4847b92"
127SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d" 119SRCREV_chromium = "93b3786290ac16c95f15c95e2c2f3d8254171ab6"
128SRCREV = "${SRCREV_qtwebengine}" 120SRCREV = "${SRCREV_qtwebengine}"
129 121
130SRCREV_FORMAT = "qtwebengine_chromium" 122SRCREV_FORMAT = "qtwebengine_chromium"
131 123
132S = "${WORKDIR}/git"
133
134# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel] 124# WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel]
135INSANE_SKIP_${PN} += "textrel" 125INSANE_SKIP_${PN} += "textrel"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 95446fb0..84b4d0ba 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
19 19
20SRCREV = "1a839b50564782feac2e5dd439686c2a0ed7d985" 20SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398"
diff --git a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
index bd8d6485..b6eabfda 100644
--- a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
+++ b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
@@ -1,19 +1,17 @@
1From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001 1From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> 2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
3Date: Wed, 14 Sep 2016 23:51:14 +0200 3Date: Wed, 14 Sep 2016 23:51:14 +0200
4Subject: [PATCH] Remove unused check for the private_headers 4Subject: [PATCH] Remove unused check for private_tests
5 5
6TL;DR: it is useless and it breaks the build -> remove 6It turns out that qt_developer_build is never used anyway.
7
8The configuration system in qtbase got changed during the 5.8
9development, and as a result, this won't build anymore. It seems that
10the new syntax is `contains(QT_CONFIG, private_tests)`, but it turns out
11that qt_developer_build is never used anyway.
12 7
13I did some git archeology and it looks like it was nuked when doing the 8I did some git archeology and it looks like it was nuked when doing the
145.2 merge from upstream. The original purpose was apparently to control 95.2 merge from upstream. The original purpose was apparently to control
15-Werror, which is nowadays controlled by CONFIG -= production_build. 10-Werror, which is nowadays controlled by CONFIG -= production_build.
16 11
12This actually fixes the build, as the QT_FOR_CONFIG += core-private which
13would have been required for qtConfig(private_tests) is missing.
14
17Task-number: QTBUG-55950 15Task-number: QTBUG-55950
18Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 16Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
19--- 17---
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 6944603d..5497ff1c 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -84,4 +84,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
84RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 84RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
85export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 85export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
86 86
87SRCREV = "431520f1508e92272171c214b087183e71d08ec5" 87SRCREV = "67fef93059ba23812d7390ec7bb8d70f8e7b0492"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 4897d257..47981c93 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "ccb138548314a767a897496c74c04a261a391027" 14SRCREV = "5e66a1c5d25caef259e6e8b41023004c2b8de355"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 16db1139..d6d3b15e 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "0f91218091da69a81eb3e3336d1bdbe572a21908" 16SRCREV = "177a8090fbe346ab34040acc60655dcb768ebf4f"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 73f5dbfd..08e0aa4c 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRCREV = "977d0fb3f0bf776e2aad3c8ff795115ce62909ff" 19SRCREV = "594ad16ae17072a44219228783f2ae051f88eba0"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 16:40:25 +0000