summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch115
-rw-r--r--recipes-qt/qt5/qt5-creator_git.bb1
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_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/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_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/qtquicktimeline_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/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_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/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch228
-rw-r--r--recipes-qt/qwt/qwt-qt5_6.1.4.bb1
29 files changed, 371 insertions, 26 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 47b0a823..c99a99b6 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
195do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
196addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
197 197
198SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" 198SRCREV = "7cec37572a8231b53fc64254bc874de599bc3af5"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index f3ba96f4..e0d6d1dd 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "76b39dd90f613f340066cc5a4ceed65ff778bdd4" 39SRCREV = "8b122b9b53687285953140b2130be6541a938737"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch b/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
new file mode 100644
index 00000000..aa21ef5e
--- /dev/null
+++ b/recipes-qt/qt5/qt5-creator/0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch
@@ -0,0 +1,115 @@
1From db11c16b977e204c7000ef689452045f85ba98b7 Mon Sep 17 00:00:00 2001
2From: Friedemann Kleint <Friedemann.Kleint@qt.io>
3Date: Thu, 12 Mar 2020 09:26:58 +0100
4Subject: [PATCH] Fix QPainterPath-related compilation errors in Qt 5.15
5
6Some include of QPainterPath was removed in Qt, causing errors like:
7
8easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath'
9easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath'
10easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int'
11to 'const QPainterPath &'
12easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath'
13easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath'
14...
15
16Add the missing include statements.
17
18Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a
19Reviewed-by: Eike Ziller <eike.ziller@qt.io>
20(cherry picked from commit b8ad0fdae90679b18238f58522058ea9b5934646)
21---
22 src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp | 2 ++
23 src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp | 1 +
24 src/libs/qmleditorwidgets/easingpane/easinggraph.cpp | 1 +
25 src/plugins/coreplugin/fancyactionbar.cpp | 1 +
26 src/plugins/coreplugin/manhattanstyle.cpp | 1 +
27 src/plugins/texteditor/texteditor.cpp | 1 +
28 src/plugins/texteditor/texteditoroverlay.cpp | 1 +
29 7 files changed, 8 insertions(+)
30
31diff --git a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
32index 880835287a..930f8450ad 100644
33--- a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
34+++ b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp
35@@ -27,6 +27,8 @@
36
37 #include "shapes.h"
38
39+#include <QPainterPath>
40+
41 namespace qmt {
42
43 ShapePaintVisitor::ShapePaintVisitor(QPainter *painter, const QPointF &scaledOrigin, const QSizeF &originalSize,
44diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
45index d43b458881..ded1b544af 100644
46--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
47+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
48@@ -30,6 +30,7 @@
49
50 #include <QGraphicsPixmapItem>
51 #include <QGraphicsScene>
52+#include <QPainterPath>
53 #include <QPropertyAnimation>
54 #include <QSequentialAnimationGroup>
55
56diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
57index 4163569c04..e8360e0db6 100644
58--- a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
59+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp
60@@ -26,6 +26,7 @@
61 #include "easinggraph.h"
62
63 #include <QPainter>
64+#include <QPainterPath>
65 #include <QStyleOptionGraphicsItem>
66 #include <math.h>
67
68diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
69index 8d496ea3d2..72875823a2 100644
70--- a/src/plugins/coreplugin/fancyactionbar.cpp
71+++ b/src/plugins/coreplugin/fancyactionbar.cpp
72@@ -38,6 +38,7 @@
73 #include <QEvent>
74 #include <QMouseEvent>
75 #include <QPainter>
76+#include <QPainterPath>
77 #include <QPixmapCache>
78 #include <QPropertyAnimation>
79 #include <QStyle>
80diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
81index 709dcf62aa..156cac322e 100644
82--- a/src/plugins/coreplugin/manhattanstyle.cpp
83+++ b/src/plugins/coreplugin/manhattanstyle.cpp
84@@ -43,6 +43,7 @@
85 #include <QLineEdit>
86 #include <QMenuBar>
87 #include <QPainter>
88+#include <QPainterPath>
89 #include <QPixmap>
90 #include <QStatusBar>
91 #include <QStyleFactory>
92diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
93index 59926e31ea..576dea22d8 100644
94--- a/src/plugins/texteditor/texteditor.cpp
95+++ b/src/plugins/texteditor/texteditor.cpp
96@@ -98,6 +98,7 @@
97 #include <QMessageBox>
98 #include <QMimeData>
99 #include <QPainter>
100+#include <QPainterPath>
101 #include <QPrintDialog>
102 #include <QPrinter>
103 #include <QPropertyAnimation>
104diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
105index a33ca13810..431045f1db 100644
106--- a/src/plugins/texteditor/texteditoroverlay.cpp
107+++ b/src/plugins/texteditor/texteditoroverlay.cpp
108@@ -30,6 +30,7 @@
109 #include <QDebug>
110 #include <QMap>
111 #include <QPainter>
112+#include <QPainterPath>
113 #include <QTextBlock>
114
115 #include <algorithm>
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb
index 5c11e4e8..927f101f 100644
--- a/recipes-qt/qt5/qt5-creator_git.bb
+++ b/recipes-qt/qt5/qt5-creator_git.bb
@@ -26,6 +26,7 @@ PV = "4.9.2+git${SRCPV}"
26SRC_URI = " \ 26SRC_URI = " \
27 git://code.qt.io/qt-creator/qt-creator.git;branch=4.9 \ 27 git://code.qt.io/qt-creator/qt-creator.git;branch=4.9 \
28 file://0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch \ 28 file://0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch \
29 file://0002-Fix-QPainterPath-related-compilation-errors-in-Qt-5..patch \
29" 30"
30SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" 31SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch"
31 32
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 0f13be32..dd1201af 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,4 @@ do_install() {
142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
143} 143}
144 144
145SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" 145SRCREV = "7cec37572a8231b53fc64254bc874de599bc3af5"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 2446ca43..479e3631 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -295,4 +295,4 @@ sed -i \
295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
296} 296}
297 297
298SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" 298SRCREV = "7cec37572a8231b53fc64254bc874de599bc3af5"
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 875d8da9..dea81794 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "8d3da74a5828b4c09847342bc45855d0889ede7d" 14SRCREV = "02dbe3346c414d9c606acd5bc799a79a67ad3c1c"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 5466217e..f22c38b6 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "531443d1f00c0ebc6a56ebc30e5eea85b318b73e" 22SRCREV = "35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 9a4a264f..6c4bff81 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
31 rm -rf ${D}${OE_QMAKE_PATH_QML} 31 rm -rf ${D}${OE_QMAKE_PATH_QML}
32} 32}
33 33
34SRCREV = "1fef24732bb5114392626a7fef956625a6cc66ac" 34SRCREV = "4482aa576b2e0e6f5b30675d2681599daaf23762"
35 35
36BBCLASSEXTEND =+ "native nativesdk" 36BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index a550e720..338d5abc 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "2bba786b2543811c28f379fa12f3c7110ff0664f" 12SRCREV = "7467bbdc843afeee748eff38f741e2417357de7a"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f2539ac2..942a0b84 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "19477de84a64f412bca9ce2df62ab9adb3859da2" 40SRCREV = "6a7d1bd6acbe7bfa9bdab8c5d2e96216bc73ce69"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 3d0d6f09..8e50721d 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "7edb958482ddf3670a6a366d186883478aab1441" 21SRCREV = "9ae4d93b0b3155716495dce6336859f9d2c4db6c"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index a22d61f6..17ed8bc3 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "0fd1c5413bd433755e54c7d69493efc45c432764" 13SRCREV = "6ec39500b6cb3ffc274b7c3c0de39beb6cc1ef00"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 2686de7a..f21588cf 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -22,7 +22,7 @@ FILES_${PN}-qmlplugins += " \
22 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 22 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
23" 23"
24 24
25SRCREV_qtquick3d = "a24fc6de882bd1a5265dabd26855997d6879d906" 25SRCREV_qtquick3d = "a77e066c15472dafa238c65e42c251592f61af0c"
26SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 26SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
27 27
28SRCREV_FORMAT = "qtquick3d_assimp" 28SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 3c81446e..391cbffd 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 qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "814682bb9a5c9ccaff30662dd757cd827f39aad0" 13SRCREV = "6cdd4b53031de17b36b30b00de0a6945470a35ad"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 6d26cea7..ce46b008 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "d286adc5c7c27fdbbb7887f3a77212a49726cede" 20SRCREV = "eb554a20ec5c48643784ce7b29f97ccfb31e7f89"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 726dce33..14817e72 100644
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtbase qtdeclarative" 11DEPENDS = "qtbase qtdeclarative"
12 12
13SRCREV = "649afa13b841cdf8339cfb605ef2ecba81768846" 13SRCREV = "973e5e6da27cee94d95ed05cc4251c70381e9ad9"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 292b5c79..85be89e3 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "09838389f3b9eaf67ad2e0b02a85a62a63fbfc38" 28SRCREV = "15e437e870279937b15674c32783c776512ca20d"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index ff36414f..c95fd63a 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "61ed1a9e09fe54b0d52afbf865de03c8c4eaed82" 13SRCREV = "85ef74c296716081b044db5fd9db4692443c229f"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14
16# 5.14.meta-qt5.1 16# 5.14.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 9c352599..32280080 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "53ce60e9f9bf8a6c6b6f1c293564998b431987be" 15SRCREV = "3c7ddeeeb9fe0f7667495d187b0c94ee3c5d4837"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index affc5381..f1d81038 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 = "8b1a6de795523156a5a74dd2a544d866a8beeb53" 14SRCREV = "3653815f3cd12291790180456fe18df9e95f82ab"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 425f7fdd..7c1d9115 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 = "215a6642a48b1272a54ce2d125346fa0b8c89847" 15SRCREV = "8dbfbe633ee7cd1853354830872fc1c60f9e2139"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 9662480c..8f148b6b 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
50" 50"
51 51
52SRCREV = "94ee5927f5551d32876f5854c8b0f630b68b4659" 52SRCREV = "98a4e4291da098b19a4a60fa8dbfcbdfa3b6a123"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
55 55
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index a5636d80..f4a56600 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
43 43
44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
45 45
46SRCREV = "7458370a6facf4261df90eea7230382756608a2e" 46SRCREV = "f195b7db8a206a6aad7734db24d611b8f9594aa1"
47 47
48BBCLASSEXTEND =+ "native nativesdk" 48BBCLASSEXTEND =+ "native nativesdk"
49 49
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index f6b77b6b..ae7c2316 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\
189 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 189 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
190" 190"
191 191
192SRCREV_qtwebengine = "795d5e2666cababe4fbf8533d8a49fdc40d8d4c1" 192SRCREV_qtwebengine = "0e59294a0f88ba167dad4279372021841f51c82e"
193SRCREV_chromium = "07787da493d9a71b994582904a188a53aae9e473" 193SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab"
194SRCREV = "${SRCREV_qtwebengine}" 194SRCREV = "${SRCREV_qtwebengine}"
195 195
196SRCREV_FORMAT = "qtwebengine_chromium" 196SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index dfeec8b0..0537f8fc 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 = "5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7" 14SRCREV = "ad75d2712a838787488e817eec318fc27bae1786"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 5a4edc46..762e5c94 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "3de65bf9daf1d0e61300cdfe44d3eca51636d438" 22SRCREV = "04b529214db0f20cce4d229a6035825390048217"
23 23
24python() { 24python() {
25 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): 25 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
diff --git a/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch b/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch
new file mode 100644
index 00000000..71a5c7ba
--- /dev/null
+++ b/recipes-qt/qwt/qwt-qt5/0001-fix-qpainterpath-build-issues.patch
@@ -0,0 +1,228 @@
1From 4f432cfcb19f41e6a4ec8d3c7f871f66e461fb63 Mon Sep 17 00:00:00 2001
2From: Mikko Gronoff <mikko.gronoff@qt.io>
3Date: Thu, 12 Mar 2020 13:14:29 +0200
4Subject: [PATCH] fix qpainterpath build issues
5
6---
7 examples/dials/attitude_indicator.cpp | 1 +
8 examples/itemeditor/editor.cpp | 1 +
9 examples/sinusplot/sinusplot.cpp | 1 +
10 src/qwt_compass_rose.cpp | 1 +
11 src/qwt_dial_needle.cpp | 1 +
12 src/qwt_null_paintdevice.cpp | 1 +
13 src/qwt_painter.cpp | 1 +
14 src/qwt_painter_command.cpp | 1 +
15 src/qwt_painter_command.h | 1 +
16 src/qwt_picker.cpp | 1 +
17 src/qwt_plot_canvas.cpp | 1 +
18 src/qwt_plot_glcanvas.cpp | 1 +
19 src/qwt_plot_glcanvas.h | 1 +
20 src/qwt_plot_panner.cpp | 1 +
21 src/qwt_plot_renderer.cpp | 1 +
22 src/qwt_plot_shapeitem.cpp | 1 +
23 src/qwt_widget_overlay.cpp | 1 +
24 17 files changed, 17 insertions(+)
25
26diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp
27index ea0d5ab..a01611e 100644
28--- a/examples/dials/attitude_indicator.cpp
29+++ b/examples/dials/attitude_indicator.cpp
30@@ -3,6 +3,7 @@
31 #include <qwt_round_scale_draw.h>
32 #include <qevent.h>
33 #include <qpainter.h>
34+#include <qpainterpath.h>
35 #include <qpolygon.h>
36
37 AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
38diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp
39index bd06372..7c4a6ef 100644
40--- a/examples/itemeditor/editor.cpp
41+++ b/examples/itemeditor/editor.cpp
42@@ -4,6 +4,7 @@
43 #include <qwt_scale_map.h>
44 #include <qwt_plot_shapeitem.h>
45 #include <qevent.h>
46+#include <qpainterpath.h>
47
48 class Overlay: public QwtWidgetOverlay
49 {
50diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp
51index 119fa4a..6a9bfe7 100644
52--- a/examples/sinusplot/sinusplot.cpp
53+++ b/examples/sinusplot/sinusplot.cpp
54@@ -1,5 +1,6 @@
55 #include <qapplication.h>
56 #include <qlayout.h>
57+#include <qpainterpath.h>
58 #include <qwt_plot.h>
59 #include <qwt_plot_marker.h>
60 #include <qwt_plot_curve.h>
61diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
62index 05f7039..fbd30fe 100644
63--- a/src/qwt_compass_rose.cpp
64+++ b/src/qwt_compass_rose.cpp
65@@ -11,6 +11,7 @@
66 #include "qwt_point_polar.h"
67 #include "qwt_painter.h"
68 #include <qpainter.h>
69+#include <qpainterpath.h>
70
71 static QPointF qwtIntersection(
72 QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
73diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
74index 49dd44a..d98f68c 100644
75--- a/src/qwt_dial_needle.cpp
76+++ b/src/qwt_dial_needle.cpp
77@@ -13,6 +13,7 @@
78 #include "qwt_painter.h"
79 #include <qapplication.h>
80 #include <qpainter.h>
81+#include <qpainterpath.h>
82
83 #if QT_VERSION < 0x040601
84 #define qFastSin(x) qSin(x)
85diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
86index 3baf0e9..468a838 100644
87--- a/src/qwt_null_paintdevice.cpp
88+++ b/src/qwt_null_paintdevice.cpp
89@@ -9,6 +9,7 @@
90
91 #include "qwt_null_paintdevice.h"
92 #include <qpaintengine.h>
93+#include <qpainterpath.h>
94 #include <qpixmap.h>
95
96 class QwtNullPaintDevice::PrivateData
97diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
98index 7959fe5..626677f 100644
99--- a/src/qwt_painter.cpp
100+++ b/src/qwt_painter.cpp
101@@ -17,6 +17,7 @@
102 #include <qframe.h>
103 #include <qrect.h>
104 #include <qpainter.h>
105+#include <qpainterpath.h>
106 #include <qpalette.h>
107 #include <qpaintdevice.h>
108 #include <qpixmap.h>
109diff --git a/src/qwt_painter_command.cpp b/src/qwt_painter_command.cpp
110index 39faca9..fcd068d 100644
111--- a/src/qwt_painter_command.cpp
112+++ b/src/qwt_painter_command.cpp
113@@ -7,6 +7,7 @@
114 * modify it under the terms of the Qwt License, Version 1.0
115 *****************************************************************************/
116
117+#include <qpainterpath.h>
118 #include "qwt_painter_command.h"
119
120 //! Construct an invalid command
121diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
122index a2f509a..fab52a8 100644
123--- a/src/qwt_painter_command.h
124+++ b/src/qwt_painter_command.h
125@@ -12,6 +12,7 @@
126
127 #include "qwt_global.h"
128 #include <qpaintengine.h>
129+#include <qpainterpath.h>
130 #include <qpixmap.h>
131 #include <qimage.h>
132 #include <qpolygon.h>
133diff --git a/src/qwt_picker.cpp b/src/qwt_picker.cpp
134index dfd7e9b..3e20578 100644
135--- a/src/qwt_picker.cpp
136+++ b/src/qwt_picker.cpp
137@@ -15,6 +15,7 @@
138 #include <qapplication.h>
139 #include <qevent.h>
140 #include <qpainter.h>
141+#include <qpainterpath.h>
142 #include <qframe.h>
143 #include <qcursor.h>
144 #include <qbitmap.h>
145diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp
146index 9438f15..bfe660d 100644
147--- a/src/qwt_plot_canvas.cpp
148+++ b/src/qwt_plot_canvas.cpp
149@@ -13,6 +13,7 @@
150 #include "qwt_math.h"
151 #include "qwt_plot.h"
152 #include <qpainter.h>
153+#include <qpainterpath.h>
154 #include <qstyle.h>
155 #include <qstyleoption.h>
156 #include <qpaintengine.h>
157diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
158index 996c0ad..6975863 100644
159--- a/src/qwt_plot_glcanvas.cpp
160+++ b/src/qwt_plot_glcanvas.cpp
161@@ -12,6 +12,7 @@
162 #include "qwt_painter.h"
163 #include <qevent.h>
164 #include <qpainter.h>
165+#include <qpainterpath.h>
166 #include <qdrawutil.h>
167 #include <qstyle.h>
168 #include <qstyleoption.h>
169diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
170index 7ca9b5a..a2dfeda 100644
171--- a/src/qwt_plot_glcanvas.h
172+++ b/src/qwt_plot_glcanvas.h
173@@ -12,6 +12,7 @@
174
175 #include "qwt_global.h"
176 #include <qframe.h>
177+#include <qpainterpath.h>
178 #include <qgl.h>
179
180 class QwtPlot;
181diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
182index b7daa05..59bd2df 100644
183--- a/src/qwt_plot_panner.cpp
184+++ b/src/qwt_plot_panner.cpp
185@@ -12,6 +12,7 @@
186 #include "qwt_plot.h"
187 #include "qwt_painter.h"
188 #include <qbitmap.h>
189+#include <qpainterpath.h>
190 #include <qstyle.h>
191 #include <qstyleoption.h>
192
193diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
194index 549c4bc..71cadec 100644
195--- a/src/qwt_plot_renderer.cpp
196+++ b/src/qwt_plot_renderer.cpp
197@@ -20,6 +20,7 @@
198 #include "qwt_math.h"
199
200 #include <qpainter.h>
201+#include <qpainterpath.h>
202 #include <qtransform.h>
203 #include <qprinter.h>
204 #include <qfiledialog.h>
205diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp
206index db7896b..56bc208 100644
207--- a/src/qwt_plot_shapeitem.cpp
208+++ b/src/qwt_plot_shapeitem.cpp
209@@ -7,6 +7,7 @@
210 * modify it under the terms of the Qwt License, Version 1.0
211 *****************************************************************************/
212
213+#include <qpainterpath.h>
214 #include "qwt_plot_shapeitem.h"
215 #include "qwt_scale_map.h"
216 #include "qwt_painter.h"
217diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
218index 5974413..fa6da48 100644
219--- a/src/qwt_widget_overlay.cpp
220+++ b/src/qwt_widget_overlay.cpp
221@@ -10,6 +10,7 @@
222 #include "qwt_widget_overlay.h"
223 #include "qwt_painter.h"
224 #include <qpainter.h>
225+#include <qpainterpath.h>
226 #include <qpaintengine.h>
227 #include <qimage.h>
228 #include <qevent.h>
diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
index 623b45e5..682ab566 100644
--- a/recipes-qt/qwt/qwt-qt5_6.1.4.bb
+++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb
@@ -16,6 +16,7 @@ inherit qmake5
16SRC_URI = " \ 16SRC_URI = " \
17 ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ 17 ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
18 file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ 18 file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \
19 file://0001-fix-qpainterpath-build-issues.patch \
19" 20"
20SRC_URI[qwt.md5sum] = "4fb1852f694420e3ab9c583526edecc5" 21SRC_URI[qwt.md5sum] = "4fb1852f694420e3ab9c583526edecc5"
21SRC_URI[qwt.sha256sum] = "1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9" 22SRC_URI[qwt.sha256sum] = "1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-03-20 22:58:37 +0000