diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-02 14:39:52 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-03 10:01:14 +0200 |
| commit | af6cd54ed2b6d8834dbf09570dbe42460bd78b92 (patch) | |
| tree | cbb55ca0f320d53b82c69b1afe063b675a20147a /recipes-qt/qt5/qtdeclarative_git.bb | |
| parent | 2da972e58650f5d44f2cfd4fc1ec4e4dc1d2cd48 (diff) | |
| parent | f9a58d623762c5fd78bd6bc18d701a7aaa004567 (diff) | |
Merge "Merge remote-tracking branch 'qt/upstream/master' into 5.14"
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 30002b12..6c97d0f6 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" |