diff options
Diffstat (limited to 'recipes-qt/qt5')
27 files changed, 142 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() { | |||
| 195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
| 196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
| 197 | 197 | ||
| 198 | SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" | 198 | SRCREV = "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 | ||
| 39 | SRCREV = "76b39dd90f613f340066cc5a4ceed65ff778bdd4" | 39 | SRCREV = "8b122b9b53687285953140b2130be6541a938737" |
| 40 | 40 | ||
| 41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "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 @@ | |||
| 1 | From db11c16b977e204c7000ef689452045f85ba98b7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Friedemann Kleint <Friedemann.Kleint@qt.io> | ||
| 3 | Date: Thu, 12 Mar 2020 09:26:58 +0100 | ||
| 4 | Subject: [PATCH] Fix QPainterPath-related compilation errors in Qt 5.15 | ||
| 5 | |||
| 6 | Some include of QPainterPath was removed in Qt, causing errors like: | ||
| 7 | |||
| 8 | easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath' | ||
| 9 | easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath' | ||
| 10 | easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int' | ||
| 11 | to 'const QPainterPath &' | ||
| 12 | easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath' | ||
| 13 | easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath' | ||
| 14 | ... | ||
| 15 | |||
| 16 | Add the missing include statements. | ||
| 17 | |||
| 18 | Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a | ||
| 19 | Reviewed-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 | |||
| 31 | diff --git a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.cpp | ||
| 32 | index 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, | ||
| 44 | diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp | ||
| 45 | index 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 | |||
| 56 | diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp | ||
| 57 | index 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 | |||
| 68 | diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp | ||
| 69 | index 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> | ||
| 80 | diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp | ||
| 81 | index 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> | ||
| 92 | diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp | ||
| 93 | index 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> | ||
| 104 | diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp | ||
| 105 | index 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}" | |||
| 26 | SRC_URI = " \ | 26 | SRC_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 | " |
| 30 | SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" | 31 | SRC_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 | ||
| 145 | SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" | 145 | SRCREV = "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 | ||
| 298 | SRCREV = "c58249c32774646a4be5c7504339b483d658a4da" | 298 | SRCREV = "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 | ||
| 12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
| 13 | 13 | ||
| 14 | SRCREV = "8d3da74a5828b4c09847342bc45855d0889ede7d" | 14 | SRCREV = "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 | ||
| 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 21 | 21 | ||
| 22 | SRCREV = "531443d1f00c0ebc6a56ebc30e5eea85b318b73e" | 22 | SRCREV = "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 | ||
| 34 | SRCREV = "1fef24732bb5114392626a7fef956625a6cc66ac" | 34 | SRCREV = "4482aa576b2e0e6f5b30675d2681599daaf23762" |
| 35 | 35 | ||
| 36 | BBCLASSEXTEND =+ "native nativesdk" | 36 | BBCLASSEXTEND =+ "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 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "2bba786b2543811c28f379fa12f3c7110ff0664f" | 12 | SRCREV = "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/ |
| 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 39 | 39 | ||
| 40 | SRCREV = "19477de84a64f412bca9ce2df62ab9adb3859da2" | 40 | SRCREV = "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 | ||
| 19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
| 20 | 20 | ||
| 21 | SRCREV = "7edb958482ddf3670a6a366d186883478aab1441" | 21 | SRCREV = "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 | ||
| 11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "0fd1c5413bd433755e54c7d69493efc45c432764" | 13 | SRCREV = "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 | ||
| 25 | SRCREV_qtquick3d = "a24fc6de882bd1a5265dabd26855997d6879d906" | 25 | SRCREV_qtquick3d = "a77e066c15472dafa238c65e42c251592f61af0c" |
| 26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
| 27 | 27 | ||
| 28 | SRCREV_FORMAT = "qtquick3d_assimp" | 28 | SRCREV_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 | ||
| 11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
| 12 | 12 | ||
| 13 | SRCREV = "814682bb9a5c9ccaff30662dd757cd827f39aad0" | 13 | SRCREV = "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 | ||
| 20 | SRCREV = "d286adc5c7c27fdbbb7887f3a77212a49726cede" | 20 | SRCREV = "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 | ||
| 11 | DEPENDS = "qtbase qtdeclarative" | 11 | DEPENDS = "qtbase qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "649afa13b841cdf8339cfb605ef2ecba81768846" | 13 | SRCREV = "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 | ||
| 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 27 | 27 | ||
| 28 | SRCREV = "09838389f3b9eaf67ad2e0b02a85a62a63fbfc38" | 28 | SRCREV = "15e437e870279937b15674c32783c776512ca20d" |
| 29 | 29 | ||
| 30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "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 | ||
| 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
| 12 | 12 | ||
| 13 | SRCREV = "61ed1a9e09fe54b0d52afbf865de03c8c4eaed82" | 13 | SRCREV = "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 | ||
| 13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
| 14 | 14 | ||
| 15 | SRCREV = "53ce60e9f9bf8a6c6b6f1c293564998b431987be" | 15 | SRCREV = "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 | ||
| 12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
| 13 | 13 | ||
| 14 | SRCREV = "8b1a6de795523156a5a74dd2a544d866a8beeb53" | 14 | SRCREV = "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 | ||
| 13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
| 14 | 14 | ||
| 15 | SRCREV = "215a6642a48b1272a54ce2d125346fa0b8c89847" | 15 | SRCREV = "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 | ||
| 52 | SRCREV = "94ee5927f5551d32876f5854c8b0f630b68b4659" | 52 | SRCREV = "98a4e4291da098b19a4a60fa8dbfcbdfa3b6a123" |
| 53 | 53 | ||
| 54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "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 | ||
| 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 44 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 45 | 45 | ||
| 46 | SRCREV = "7458370a6facf4261df90eea7230382756608a2e" | 46 | SRCREV = "f195b7db8a206a6aad7734db24d611b8f9594aa1" |
| 47 | 47 | ||
| 48 | BBCLASSEXTEND =+ "native nativesdk" | 48 | BBCLASSEXTEND =+ "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 | ||
| 192 | SRCREV_qtwebengine = "795d5e2666cababe4fbf8533d8a49fdc40d8d4c1" | 192 | SRCREV_qtwebengine = "0e59294a0f88ba167dad4279372021841f51c82e" |
| 193 | SRCREV_chromium = "07787da493d9a71b994582904a188a53aae9e473" | 193 | SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" |
| 194 | SRCREV = "${SRCREV_qtwebengine}" | 194 | SRCREV = "${SRCREV_qtwebengine}" |
| 195 | 195 | ||
| 196 | SRCREV_FORMAT = "qtwebengine_chromium" | 196 | SRCREV_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 | ||
| 12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
| 13 | 13 | ||
| 14 | SRCREV = "5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7" | 14 | SRCREV = "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 = "(.*)" | |||
| 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
| 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
| 21 | 21 | ||
| 22 | SRCREV = "3de65bf9daf1d0e61300cdfe44d3eca51636d438" | 22 | SRCREV = "04b529214db0f20cce4d229a6035825390048217" |
| 23 | 23 | ||
| 24 | python() { | 24 | python() { |
| 25 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | 25 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): |
