diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 12:32:13 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-10 18:16:10 +0200 |
commit | 65028944ee13f5fa7939aa0b669ecc8ad358012d (patch) | |
tree | b0bd5fcacb9b26cdfbcdbe8b9cf5568f59a8a729 /recipes-qt/qt5/qtdeclarative_git.bb | |
parent | eb59ee61d4bc967673346bc16f6585f7ab7cee55 (diff) | |
parent | 5114e3057ceb4afc7f2ae9f71bb351f9e5c7f553 (diff) |
Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 47122d86..9a4a264f 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -12,9 +12,12 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ - file://0001-Use-python3-explicitly.patch \ - " +# Patches from https://github.com/meta-qt5/qtdeclarative/commits/b5.14 +# 5.14.meta-qt5.1 +SRC_URI += " \ + file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ + file://0002-Use-python3-explicitly.patch \ +" DEPENDS += "qtbase qtdeclarative-native" |