diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-30 12:10:07 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-02-04 23:10:03 +0200 |
| commit | 27c10f248765d736bc45fd7d9ff6afd609a804fc (patch) | |
| tree | 9f1d2d9e98f240d8857d64fd30975853177f8cbe /recipes-qt/qt5/qtdeclarative_git.bb | |
| parent | c017b5dc4c3d3e59f64c3beb7316335f6d341ee4 (diff) | |
qt5: update submodules
* Update to latest content in Qt 5.15 branch
* Exclude qtwebkit recipe from CI & toolchain as it does not build
with latest 5.15 content
* Remove qtwebkit dependency in qtcreator recipe, it is not needed
anymore
Task-number: QTBUG-80823
Change-Id: I4e98c56749f5f5cd24efbd1e021b39e3947954a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 33afe4b9..61e6e274 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -16,7 +16,7 @@ SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.pat file://0001-Use-python3-explicitly.patch \ " -DEPENDS += "qtbase" +DEPENDS += "qtbase qtdeclarative-native" PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" @@ -28,6 +28,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "289c0fdc2cafd79e3178a9cd3cfc6c5bd53c8336" +SRCREV = "b6143c08077c7d692fad9daa628f3ded8fa97f68" BBCLASSEXTEND =+ "native nativesdk" |