summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-06-06 13:08:30 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-11 06:32:55 +0000
commitb72dbdfcb6e1e3c520de216cda4d0893d6372bd2 (patch)
tree113f00de9d6539a132b5b63683e0c6771329d7ee
parentdc32862fb82686c30722970619ad1187695e6e60 (diff)
downloadmeta-qt5-b72dbdfcb6e1e3c520de216cda4d0893d6372bd2.tar.gz
qt5: update submodules
Update submodules to Qt 5.6.3 (snapshot 1) Change-Id: I67d3799d7822173a6cbe9b3e60223dca79ae7f6e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch10
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-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/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb3
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch156
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb12
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-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
32 files changed, 39 insertions, 199 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 54a5b521..47f7fff1 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -239,4 +239,4 @@ fakeroot do_generate_qt_environment_file() {
239 239
240addtask generate_qt_environment_file after do_install before do_package 240addtask generate_qt_environment_file after do_install before do_package
241 241
242SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" 242SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 7b289dad..da87c1c1 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
28" 28"
29 29
30SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" 30SRCREV = "fc781fa42287a4f5db62a346ad6eb8bcbb9f49c0"
31 31
32BBCLASSEXTEND += "native nativesdk" 32BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 2bc7b9b0..91298dd7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -11,4 +11,4 @@ SRC_URI = " \
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14PV = "5.6.2+git${SRCPV}" 14PV = "5.6.3+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index a928a9a4..608b41a0 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -117,4 +117,4 @@ do_install() {
117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
118} 118}
119 119
120SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" 120SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3"
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index 70a71ff9..621e3412 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
1From d98f945aade15bf49eb7c016d2eefd513351b360 Mon Sep 17 00:00:00 2001 1From cb1e143a42e41524f16043c92b728dfae54586f9 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Mon, 12 Oct 2015 09:55:30 +0200 3Date: Mon, 12 Oct 2015 09:55:30 +0200
4Subject: [PATCH] configure: Separate host and build platform. 4Subject: [PATCH] configure: Separate host and build platform.
@@ -76,7 +76,7 @@ index bc5258c..f5db184 100755
76 -spec "$QMKSPEC" \ 76 -spec "$QMKSPEC" \
77 "CONFIG+=$QMAKE_CONFIG" \ 77 "CONFIG+=$QMAKE_CONFIG" \
78diff --git a/configure b/configure 78diff --git a/configure b/configure
79index 55b1886..ef9c29b 100755 79index 2073880..79eabe0 100755
80--- a/configure 80--- a/configure
81+++ b/configure 81+++ b/configure
82@@ -105,9 +105,11 @@ QT_CONFIG= 82@@ -105,9 +105,11 @@ QT_CONFIG=
@@ -594,15 +594,15 @@ index 3123f7c..0000000
594-TEMPLATE = aux 594-TEMPLATE = aux
595-QMAKE_DOCS = $$PWD/doc/qmake.qdocconf 595-QMAKE_DOCS = $$PWD/doc/qmake.qdocconf
596diff --git a/qtbase.pro b/qtbase.pro 596diff --git a/qtbase.pro b/qtbase.pro
597index 98ca86a..11cff9e 100644 597index 78f9b3a..88ff2de 100644
598--- a/qtbase.pro 598--- a/qtbase.pro
599+++ b/qtbase.pro 599+++ b/qtbase.pro
600@@ -4,7 +4,7 @@ 600@@ -4,7 +4,7 @@
601 601
602 load(qt_parts) 602 load(qt_parts)
603 603
604-SUBDIRS += qmake/qmake-docs.pro 604-SUBDIRS += qmake/qmake-docs.pro doc
605+SUBDIRS += qmake/qmake-aux.pro 605+SUBDIRS += qmake/qmake-aux.pro doc
606 606
607 cross_compile: CONFIG += nostrip 607 cross_compile: CONFIG += nostrip
608 608
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 114acdf3..cd94344a 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -253,4 +253,4 @@ sysroot_stage_dirs_append() {
253 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 253 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
254} 254}
255 255
256SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" 256SRCREV = "1131db8b4708dfa222b50fb4981a7becaf5ae4a3"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 8025178c..db2f06ac 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 = "85fe2daab5ed14655b456df8821c9f5f606fdc12" 13SRCREV = "61804e56b82330fac0f29beec0e56262233467bb"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 3252411e..d117c859 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4" 28SRCREV = "825c0c8d54a7009c6af5cb73736138150cc5cc63"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 82468158..5e0e6620 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() {
39 39
40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
41 41
42SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6" 42SRCREV = "caa273e3bc6a2bece76c190b4135103eb7bbeab9"
43 43
44BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 24ae3e1b..89fd4297 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5" 20SRCREV = "4dc734d85f59e3a16a50a9d7ffebc7aa304f5243"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index e7bce9de..974cbd07 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936" 31SRCREV = "b6ffd71e2315e699d4ad32859cf36c67635820e7"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 80d7699a..09ab0cae 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec" 32SRCREV = "d2b7d77b7d882e00a2c1bb938a04493e4b1b6d44"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 8e3da52d..6ba03e31 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 36"
37 37
38SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5" 38SRCREV = "6d4948122063b651948a5c4db2197d633d7e96c4"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 6c2d3095..0c5d2cb6 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -26,4 +26,4 @@ do_configure_prepend() {
26 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro 26 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
27} 27}
28 28
29SRCREV = "5eab543c5c955f5057225b9bdb6b2757516dbd3e" 29SRCREV = "b934c54583adc4f9021de2753f99836f60a96688"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 32053e45..fc2eaa00 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative"
12 12
13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" 13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
14 14
15SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244" 15SRCREV = "be77d8798a1df1cb928b944c145db3fa9aeb9777"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index aeaa9678..0062489f 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ SRC_URI += " \
17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
18" 18"
19 19
20SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70" 20SRCREV = "a1149499650fe989016160941a715020aad42893"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 21199f76..6e2327aa 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "9dc78a2d847bca5ec7b1445356523383a030d7ce" 30SRCREV = "8196140bedcaca11dbe0e06342e942e52e9d69eb"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 345c5cb9..fa77a636 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase qtdeclarative" 15DEPENDS += "qtbase qtdeclarative"
16 16
17SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e" 17SRCREV = "12b98b6ff70a18c27f543dda029e75c197d8cbc5"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index fdcba1e3..8764622c 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 = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8" 18SRCREV = "9e4b9d276f0de2d298da4ffdf6f15a9960402194"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 145ac65f..a17b885c 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96" 16SRCREV = "810b6defac666c7652a77b5e4fd5b70a6fbe0c54"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 0e7b6697..59a380e0 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e" 34SRCREV = "a4f656126803b6cfac8ac4b442ee975562145b73"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 5995c991..6e40b9e2 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 = "225e1740fec4559bf8d66d915ddd06b9d4f48119" 117SRCREV = "e0ee24efee5472d353accb70fa86274bc34a34db"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index ab2eaed7..a8c38609 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -15,7 +15,6 @@ DEPENDS = "qtbase-native wayland-native"
15 15
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \ 17 file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \
18 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
19" 18"
20 19
21do_configure() { 20do_configure() {
@@ -26,4 +25,4 @@ do_install() {
26 oe_runmake install INSTALL_ROOT=${D} 25 oe_runmake install INSTALL_ROOT=${D}
27} 26}
28 27
29SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" 28SRCREV = "d6f7bb39e71777ce5568d462841caccc17f3a205"
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 d173e673..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
+++ /dev/null
@@ -1,156 +0,0 @@
1From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 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 | 21 ++++++++++++++++++---
13 src/client/qwaylandintegration_p.h | 12 ++++++++++++
14 2 files changed, 30 insertions(+), 3 deletions(-)
15
16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17index 39fff53..481e3d6 100644
18--- a/src/client/qwaylandintegration.cpp
19+++ b/src/client/qwaylandintegration.cpp
20@@ -39,7 +39,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@@ -57,7 +59,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@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration()
41 , mNativeInterface(new QWaylandNativeInterface(this))
42 #ifndef QT_NO_ACCESSIBILITY
43 , mAccessibility(new QPlatformAccessibility())
44-#else
45- , mAccessibility(0)
46 #endif
47 , mClientBufferIntegrationInitialized(false)
48 , mServerBufferIntegrationInitialized(false)
49@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration()
50 {
51 initializeInputDeviceIntegration();
52 mDisplay = new QWaylandDisplay(this);
53+#ifndef QT_NO_CLIPBOARD
54 mClipboard = new QWaylandClipboard(mDisplay);
55+#endif
56+#ifndef QT_NO_DRAGANDDROP
57 mDrag = new QWaylandDrag(mDisplay);
58-
59+#endif
60 QString icStr = QPlatformInputContextFactory::requested();
61 icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay))
62 : mInputContext.reset(QPlatformInputContextFactory::create(icStr));
63@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration()
64
65 QWaylandIntegration::~QWaylandIntegration()
66 {
67+#ifndef QT_NO_DRAGANDDROP
68 delete mDrag;
69+#endif
70+#ifndef QT_NO_CLIPBOARD
71 delete mClipboard;
72+#endif
73 #ifndef QT_NO_ACCESSIBILITY
74 delete mAccessibility;
75 #endif
76@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
77 return mFontDb;
78 }
79
80+#ifndef QT_NO_CLIPBOARD
81 QPlatformClipboard *QWaylandIntegration::clipboard() const
82 {
83 return mClipboard;
84 }
85+#endif
86
87+#ifndef QT_NO_DRAGANDDROP
88 QPlatformDrag *QWaylandIntegration::drag() const
89 {
90 return mDrag;
91 }
92+#endif
93
94 QPlatformInputContext *QWaylandIntegration::inputContext() const
95 {
96@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
97 return QPlatformIntegration::styleHint(hint);
98 }
99
100+#ifndef QT_NO_ACCESSIBILITY
101 QPlatformAccessibility *QWaylandIntegration::accessibility() const
102 {
103 return mAccessibility;
104 }
105+#endif
106
107 QPlatformServices *QWaylandIntegration::services() const
108 {
109diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
110index 987d805..b50ad95 100644
111--- a/src/client/qwaylandintegration_p.h
112+++ b/src/client/qwaylandintegration_p.h
113@@ -80,15 +80,21 @@ public:
114
115 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
116
117+#ifndef QT_NO_CLIPBOARD
118 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
119+#endif
120
121+#ifndef QT_NO_DRAGANDDROP
122 QPlatformDrag *drag() const Q_DECL_OVERRIDE;
123+#endif
124
125 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
126
127 QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
128
129+#ifndef QT_NO_ACCESSIBILITY
130 QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
131+#endif
132
133 QPlatformServices *services() const Q_DECL_OVERRIDE;
134
135@@ -117,12 +123,18 @@ private:
136 void initializeInputDeviceIntegration();
137
138 QPlatformFontDatabase *mFontDb;
139+#ifndef QT_NO_CLIPBOARD
140 QPlatformClipboard *mClipboard;
141+#endif
142+#ifndef QT_NO_DRAGANDDROP
143 QPlatformDrag *mDrag;
144+#endif
145 QWaylandDisplay *mDisplay;
146 QPlatformNativeInterface *mNativeInterface;
147 QScopedPointer<QPlatformInputContext> mInputContext;
148+#ifndef QT_NO_ACCESSIBILITY
149 QPlatformAccessibility *mAccessibility;
150+#endif
151 bool mClientBufferIntegrationInitialized;
152 bool mServerBufferIntegrationInitialized;
153 bool mShellIntegrationInitialized;
154--
1552.7.4
156
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 6c15b69f..0439ab2f 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -34,7 +34,6 @@ FILES_${PN}-plugins-dbg += " \
34 34
35SRC_URI += " \ 35SRC_URI += " \
36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
37 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
38" 37"
39 38
40SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" 39SRCREV = "d6f7bb39e71777ce5568d462841caccc17f3a205"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 55a1cb92..001e8ca0 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de" 18SRCREV = "18a53cef73eed59cddd7962d4e4aa8fbf7d3170a"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 1e903ae2..c368bbdd 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -2,11 +2,9 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt"
2 2
3LICENSE = "LGPL-3.0 & BSD" 3LICENSE = "LGPL-3.0 & BSD"
4LIC_FILES_CHKSUM = " \ 4LIC_FILES_CHKSUM = " \
5 file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ 5 file://src/core/browser_context_qt.cpp;md5=8b5dcd02451f832169d229afb56f27fd;beginline=1;endline=35 \
6 file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ 6 file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
7 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
10" 8"
11 9
12DEPENDS += " \ 10DEPENDS += " \
@@ -107,7 +105,7 @@ RDEPENDS_${PN}-examples += " \
107 qtdeclarative-qmlplugins \ 105 qtdeclarative-qmlplugins \
108" 106"
109 107
110QT_MODULE_BRANCH_CHROMIUM = "45-based" 108QT_MODULE_BRANCH_CHROMIUM = "49-based"
111 109
112SRC_URI += " \ 110SRC_URI += " \
113 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 111 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
@@ -120,10 +118,10 @@ SRC_URI += " \
120 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 118 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
121" 119"
122 120
123SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380" 121SRCREV_qtwebengine = "e4ea5215ff40e5e179aeeeaa320e588a25c3ec13"
124# This is in git submodule, but we're using latest in 45-based 122# This is in git submodule, but we're using latest in 45-based
125# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" 123# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
126SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" 124SRCREV_chromium = "a0b159a148a8de89ad44fa2d64e488fd9a4aee87"
127SRCREV = "${SRCREV_qtwebengine}" 125SRCREV = "${SRCREV_qtwebengine}"
128 126
129SRCREV_FORMAT = "qtwebengine_chromium" 127SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 3f1ab500..65a8196e 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
20RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 20RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
21 21
22SRCREV = "2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383" 22SRCREV = "0c623fab420102c54fa533da3b8ca774290d6d13"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 3d2dbdf8..b7848978 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
71RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 71RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
72export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 72export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
73 73
74SRCREV = "bb43bca1664721401c3a2c25b585913bb5e8cb4f" 74SRCREV = "95a78c9f04d9a3f954477855f84180ced556a480"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index c71a69f3..6cdf58a3 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 = "ef7b03e3e5e20f89963bae799f7ecb753f332c34" 14SRCREV = "d3032491971e1cee8f1171f16b8e6d3d2fa42eed"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index eaed56c4..e4839f39 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 = "df10edcfae328f397c99192b322268c9e96f6dab" 16SRCREV = "25e20a724f411f6e07cd3dc9f4870298a308c2c3"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index f715f1e7..15314b00 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" 16SRCREV = "0533f8ba47f57da5d7363c2c00cf0b239ce72888"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"