diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-21 08:11:40 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-21 08:11:40 +0200 |
| commit | e1895fbb38d7fbdb94abe3db77836813d52c60ff (patch) | |
| tree | a480519e6fdb973678ac0bc98f1c4af2d6beaf78 | |
| parent | 933e47e3fd524a9705c888351ceb8dd523395017 (diff) | |
| parent | 0924e7a15d9ce36ef1869175cae3738071bd9edb (diff) | |
Merge remote-tracking branch 'qtyocto/5.10' into 5.11
* qtyocto/5.10:
qtscript: update license files checksum
qt5: update submodules
qtknx: add recipe
Change-Id: Ie146f32442e42ee3adc60d6fe1e22ed0b8885139
| -rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 12 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb new file mode 100644 index 00000000..5e01e3c9 --- /dev/null +++ b/recipes-qt/qt5/qtknx_git.bb @@ -0,0 +1,12 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ +" + +DEPENDS += "qtbase" + +SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 406bdb63..b705f7c4 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "45d87f0d9260ef0c42434daa329e77aecf3f5d46" +SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" |