summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb4
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch35
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch (renamed from recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch)14
-rw-r--r--recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch (renamed from recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch)4
-rw-r--r--recipes-qt/qt5/qttools_git.bb5
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb3
-rw-r--r--recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch17
-rw-r--r--recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch35
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch (renamed from recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch)4
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch (renamed from recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch)5
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
24 files changed, 60 insertions, 105 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e1b30c9a..d229c21d 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -25,6 +25,8 @@ require qt5-git.inc
25FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" 25FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
26 26
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
29# 5.9.meta-qt5-shared.1
28SRC_URI += "\ 30SRC_URI += "\
29 file://0001-Add-linux-oe-g-platform.patch \ 31 file://0001-Add-linux-oe-g-platform.patch \
30 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -37,6 +39,8 @@ SRC_URI += "\
37" 39"
38 40
39# common for qtbase-native and nativesdk-qtbase 41# common for qtbase-native and nativesdk-qtbase
42# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
43# 5.9.meta-qt5-native.1
40SRC_URI += " \ 44SRC_URI += " \
41 file://0009-Always-build-uic.patch \ 45 file://0009-Always-build-uic.patch \
42" 46"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 41b5fbc3..4226bac6 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
12DEPENDS_class-target += "qtdeclarative qt3d-native" 12DEPENDS_class-target += "qtdeclarative qt3d-native"
13 13
14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
15# 5.9.meta-qt5.1
14SRC_URI += " \ 16SRC_URI += " \
15 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
16 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ 18 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 84cb2b00..336df95b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -20,6 +20,8 @@ require qt5-native.inc
20require qt5-git.inc 20require qt5-git.inc
21 21
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
24# 5.9.meta-qt5-shared.1
23SRC_URI += "\ 25SRC_URI += "\
24 file://0001-Add-linux-oe-g-platform.patch \ 26 file://0001-Add-linux-oe-g-platform.patch \
25 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 27 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -32,6 +34,8 @@ SRC_URI += "\
32" 34"
33 35
34# common for qtbase-native and nativesdk-qtbase 36# common for qtbase-native and nativesdk-qtbase
37# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
38# 5.9.meta-qt5-native.1
35SRC_URI += " \ 39SRC_URI += " \
36 file://0009-Always-build-uic.patch \ 40 file://0009-Always-build-uic.patch \
37" 41"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c535380b..1c18d0dc 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = " \
15" 15"
16 16
17# common for qtbase-native, qtbase-nativesdk and qtbase 17# common for qtbase-native, qtbase-nativesdk and qtbase
18# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
19# 5.9.meta-qt5-shared.1
18SRC_URI += "\ 20SRC_URI += "\
19 file://0001-Add-linux-oe-g-platform.patch \ 21 file://0001-Add-linux-oe-g-platform.patch \
20 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 22 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch b/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
deleted file mode 100644
index 050a914e..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From f9dcbf008b430aadd464985b7a618eca8173d264 Mon Sep 17 00:00:00 2001
2From: Robert Griebl <robert.griebl@pelagicore.com>
3Date: Thu, 23 Feb 2017 15:11:13 +0100
4Subject: [PATCH 1/3] Fix QQmlExpression leaking QQmlError objects
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9If the user doesn't clear any potential errors manually via clearError(),
10then do it automatically in the destructor. Found with valgrind.
11
12[ChangeLog][QtQml][QQmlExpression] Fixed memory leak
13
14Change-Id: If5b1181850c7463c939a7ba536d74e7054c53d60
15Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
16Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
17---
18 src/qml/qml/qqmlexpression.cpp | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
22index 6afbd05..5cb3d4d 100644
23--- a/src/qml/qml/qqmlexpression.cpp
24+++ b/src/qml/qml/qqmlexpression.cpp
25@@ -200,6 +200,7 @@ QQmlExpression::QQmlExpression(QQmlContextData *ctxt, QObject *scope,
26 */
27 QQmlExpression::~QQmlExpression()
28 {
29+ clearError();
30 }
31
32 /*!
33--
342.9.3
35
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2194d33a..ecd64ee3 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -11,10 +11,6 @@ LIC_FILES_CHKSUM = " \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
13 13
14SRC_URI += " \
15 file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \
16"
17
18DEPENDS += "qtbase" 14DEPENDS += "qtbase"
19 15
20PACKAGECONFIG ??= "qtxmlpatterns" 16PACKAGECONFIG ??= "qtxmlpatterns"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7d434a4b..c50a917a 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
17# 5.9.meta-qt5.1
16SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" 18SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
17 19
18PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 19966183..998f32f5 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -25,6 +25,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
25# Disable GStreamer if completely disabled 25# Disable GStreamer if completely disabled
26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" 26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
27 27
28# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
29# 5.9.meta-qt5.1
28SRC_URI += "\ 30SRC_URI += "\
29 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 31 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
30" 32"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 83ed908d..0ea314b8 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -22,6 +22,8 @@ FILES_${PN}-qmlplugins += " \
22 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 22 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
23" 23"
24 24
25# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
26# 5.9.meta-qt5.1
25SRC_URI += " \ 27SRC_URI += " \
26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
27" 29"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index f563818d..a7e34472 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -11,6 +11,8 @@ require qt5-git.inc
11 11
12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" 12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
13 13
14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
15# 5.9.meta-qt5.1
14SRC_URI += " \ 16SRC_URI += " \
15 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
16" 18"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index c2c00e1b..e9ca8c19 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -12,6 +12,8 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" 13SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.1
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16 18
17do_install_append_class-nativesdk() { 19do_install_append_class-nativesdk() {
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
index 88c39c74..ed25390b 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001 1From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH] add noqtwebkit configuration 4Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 3 insertions(+), 3 deletions(-) 16 2 files changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index ef5c595..9c2dc1c 100644 19index 540c9689..2312b521 100644
20--- a/src/assistant/assistant/assistant.pro 20--- a/src/assistant/assistant/assistant.pro
21+++ b/src/assistant/assistant/assistant.pro 21+++ b/src/assistant/assistant/assistant.pro
22@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
23-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { 23-false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
24+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { 24+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
25 # FIXME: currently broken
25 BROWSER = qtwebkit 26 BROWSER = qtwebkit
26 } else { 27 } else {
27 BROWSER = qtextbrowser 28@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \
28@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
29 openpagesmanager.cpp \ 29 openpagesmanager.cpp \
30 openpagesswitcher.cpp 30 openpagesswitcher.cpp
31 31
@@ -35,7 +35,7 @@ index ef5c595..9c2dc1c 100644
35 QT += webkitwidgets 35 QT += webkitwidgets
36 SOURCES += helpviewer_qwv.cpp 36 SOURCES += helpviewer_qwv.cpp
37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
38index 500a153..b60fa2d 100644 38index 500a1534..b60fa2d9 100644
39--- a/src/designer/src/plugins/plugins.pro 39--- a/src/designer/src/plugins/plugins.pro
40+++ b/src/designer/src/plugins/plugins.pro 40+++ b/src/designer/src/plugins/plugins.pro
41@@ -1,6 +1,6 @@ 41@@ -1,6 +1,6 @@
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
index 1a201de9..b2e017eb 100644
--- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,4 +1,4 @@
1From f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001 1From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
@@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for
9 1 file changed, 3 insertions(+), 12 deletions(-) 9 1 file changed, 3 insertions(+), 12 deletions(-)
10 10
11diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in 11diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
12index 4318b16..2e3b70f 100644 12index 4318b16f..2e3b70fa 100644
13--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in 13--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
14+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in 14+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
15@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ 15@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 9ca90a2c..871b0613 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -14,9 +14,12 @@ inherit ptest
14 14
15DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 15DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
16 16
17# Patches from https://github.com/meta-qt5/qttools/commits/b5.9
18# 5.9.meta-qt5.1
17SRC_URI += " \ 19SRC_URI += " \
18 file://run-ptest \ 20 file://run-ptest \
19 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 21 file://0001-add-noqtwebkit-configuration.patch \
22 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
20" 23"
21 24
22FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" 25FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 2b865bbb..ec1dc42f 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -5,6 +5,9 @@ LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7" 7"
8
9# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
10# 5.9.meta-qt5.1
8SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" 11SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
9 12
10# To enabled Nuance T9 Write support, you need to provide the licensed components 13# To enabled Nuance T9 Write support, you need to provide the licensed components
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
index 555bb28f..a86868e9 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -1,4 +1,4 @@
1From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001 1From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
2From: Raphael Freudiger <laser_b@gmx.ch> 2From: Raphael Freudiger <laser_b@gmx.ch>
3Date: Tue, 10 Jan 2017 15:49:55 +0100 3Date: Tue, 10 Jan 2017 15:49:55 +0100
4Subject: [PATCH] fix build without xkbcommon-evdev 4Subject: [PATCH] fix build without xkbcommon-evdev
@@ -16,17 +16,17 @@ Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
16 3 files changed, 11 insertions(+), 6 deletions(-) 16 3 files changed, 11 insertions(+), 6 deletions(-)
17 17
18diff --git a/src/client/client.pro b/src/client/client.pro 18diff --git a/src/client/client.pro b/src/client/client.pro
19index 7482cfd..cb3578c 100644 19index eae7ad52..0bb7b188 100644
20--- a/src/client/client.pro 20--- a/src/client/client.pro
21+++ b/src/client/client.pro 21+++ b/src/client/client.pro
22@@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \ 22@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \
23 wayland-decoration-client \ 23 wayland-decoration-client \
24 wayland-shell-integration 24 wayland-shell-integration
25 load(qt_module) 25 load(qt_module)
26+ 26+
27+LIBS += -lxkbcommon 27+LIBS += -lxkbcommon
28diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro 28diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
29index dc9000d..4eebfd6 100644 29index dc9000d9..4eebfd64 100644
30--- a/src/compositor/compositor.pro 30--- a/src/compositor/compositor.pro
31+++ b/src/compositor/compositor.pro 31+++ b/src/compositor/compositor.pro
32@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) 32@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri)
@@ -36,10 +36,10 @@ index dc9000d..4eebfd6 100644
36+ 36+
37+LIBS += -lxkbcommon 37+LIBS += -lxkbcommon
38diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp 38diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
39index 55381b4..5c054c6 100644 39index c30f7b18..e6f1a0b3 100644
40--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp 40--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
41+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp 41+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
42@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) 42@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
43 xkb_state = xkb_state_new(keymap); 43 xkb_state = xkb_state_new(keymap);
44 } 44 }
45 45
@@ -52,7 +52,7 @@ index 55381b4..5c054c6 100644
52 52
53 void QWaylandKeyboardPrivate::createXKBKeymap() 53 void QWaylandKeyboardPrivate::createXKBKeymap()
54 { 54 {
55@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() 55@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
56 } 56 }
57 #endif 57 #endif
58 58
@@ -66,6 +66,3 @@ index 55381b4..5c054c6 100644
66 void QWaylandKeyboardPrivate::sendRepeatInfo() 66 void QWaylandKeyboardPrivate::sendRepeatInfo()
67 { 67 {
68 Q_FOREACH (Resource *resource, resourceMap()) { 68 Q_FOREACH (Resource *resource, resourceMap()) {
69--
702.9.3
71
diff --git a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch b/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
deleted file mode 100644
index 29c9180c..00000000
--- a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 3d30fd8df9b55449844207295ad3d51cc8bb44b1 Mon Sep 17 00:00:00 2001
2From: Robert Griebl <robert.griebl@pelagicore.com>
3Date: Thu, 15 Dec 2016 17:43:00 +0100
4Subject: [PATCH 2/2] Fix initial window property values being propagated
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This was broken since the the shell-surface refactoring.
10
11Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0
12Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
13Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
14Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
15---
16 src/client/qwaylandwindow.cpp | 3 +++
17 1 file changed, 3 insertions(+)
18
19diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
20index c8be9c1..b6f16f0 100644
21--- a/src/client/qwaylandwindow.cpp
22+++ b/src/client/qwaylandwindow.cpp
23@@ -176,6 +176,9 @@ void QWaylandWindow::initWindow()
24 mShellSurface->setAppId(appId);
25 }
26 }
27+ // the user may have already set some window properties, so make sure to send them out
28+ for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it)
29+ mShellSurface->sendProperty(it.key(), it.value());
30 }
31
32 // Enable high-dpi rendering. Scale() returns the screen scale factor and will
33--
342.9.3
35
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 91c7230a..cece86ed 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -39,10 +39,11 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" 40SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.1
42# From https://bugreports.qt.io/browse/QTBUG-57767 44# From https://bugreports.qt.io/browse/QTBUG-57767
43SRC_URI += " \ 45SRC_URI += " \
44 file://0001-fix-build-without-xkbcommon-evdev.patch \ 46 file://0001-fix-build-without-xkbcommon-evdev.patch \
45 file://0002-Fix-initial-window-property-values-being-propagated.patch \
46" 47"
47 48
48BBCLASSEXTEND =+ "native nativesdk" 49BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 830e6402..98797493 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -130,6 +130,7 @@ RDEPENDS_${PN}-examples += " \
130QT_MODULE_BRANCH_CHROMIUM = "56-based" 130QT_MODULE_BRANCH_CHROMIUM = "56-based"
131 131
132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
133# 5.9.meta-qt5.1
133SRC_URI += " \ 134SRC_URI += " \
134 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
135 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
@@ -140,6 +141,7 @@ SRC_URI += " \
140" 141"
141 142
142# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
144# 56-based.meta-qt5.1
143SRC_URI += " \ 145SRC_URI += " \
144 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ 146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
145 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index d96636e6..d393dc41 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,4 +1,4 @@
1From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 1From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 deletion(-) 14 1 file changed, 1 deletion(-)
15 15
16diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf 16diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
17index fd66af6..ef754c3 100644 17index fd66af670..ef754c367 100644
18--- a/Tools/qmake/mkspecs/features/unix/default_post.prf 18--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
19+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf 19+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
20@@ -61,7 +61,6 @@ linux-*g++* { 20@@ -61,7 +61,6 @@ linux-*g++* {
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
index a16801b5..147a7baa 100644
--- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,4 +1,4 @@
1From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 1From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 2 insertions(+), 2 deletions(-) 12 1 file changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp 14diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
15index 1b2091f..ba03a28 100644 15index 1b2091f53..ba03a28ec 100644
16--- a/Source/WTF/wtf/Assertions.cpp 16--- a/Source/WTF/wtf/Assertions.cpp
17+++ b/Source/WTF/wtf/Assertions.cpp 17+++ b/Source/WTF/wtf/Assertions.cpp
18@@ -61,7 +61,7 @@ 18@@ -61,7 +61,7 @@
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
index e4a108e8..debbda1e 100644
--- a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
@@ -1,4 +1,4 @@
1From d8d9b1eb468f5e5d5d9f0b196fc0acb641998c8b Mon Sep 17 00:00:00 2001 1From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001
2From: Konstantin Tokarev <annulen@yandex.ru> 2From: Konstantin Tokarev <annulen@yandex.ru>
3Date: Thu, 4 May 2017 15:12:37 +0300 3Date: Thu, 4 May 2017 15:12:37 +0300
4Subject: [PATCH] Fix compilation with ICU 59 4Subject: [PATCH] Fix compilation with ICU 59
@@ -87,6 +87,3 @@ index cbac67dd8..23400a64e 100644
87 } 87 }
88 88
89 size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) 89 size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
90--
912.13.3
92
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 5c1ecfa8..0792c4ad 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -18,10 +18,12 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
18ARM_INSTRUCTION_SET_armv4 = "arm" 18ARM_INSTRUCTION_SET_armv4 = "arm"
19ARM_INSTRUCTION_SET_armv5 = "arm" 19ARM_INSTRUCTION_SET_armv5 = "arm"
20 20
21# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
22# 5.9.meta-qt5.1
21SRC_URI += "\ 23SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 24 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 25 file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
24 file://0004-Fix-compilation-with-ICU-59.patch \ 26 file://0003-Fix-compilation-with-ICU-59.patch \
25" 27"
26 28
27PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ 29PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index d48b6c42..8b79aa1c 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = " \
9require qt5.inc 9require qt5.inc
10require qt5-git.inc 10require qt5-git.inc
11 11
12# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
13# 5.9.meta-qt5.1
12SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" 14SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
13 15
14DEPENDS += "qtbase qtwebengine" 16DEPENDS += "qtbase qtwebengine"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-15 07:35:29 +0000