diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-28 15:22:43 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-28 15:22:43 +0200 |
commit | bf596ae52a666425a0e58b3fc9ab2c997d783b88 (patch) | |
tree | c16247738b836598e31fb94aa101c4806748922f /recipes-qt/qt5-addons | |
parent | bed3337b5fd6c65a1306536fd66b72213f23ece1 (diff) | |
parent | a9e35b7be8144b7a470f0274abd820e1ad041eed (diff) | |
download | meta-boot2qt-bf596ae52a666425a0e58b3fc9ab2c997d783b88.tar.gz |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
meta-qt5: update meta layer
qbsp: various improvements to qbsp creation
qbsp: update installer-framework
meta-qt5: update meta layer
meta-qt5: update meta layer
meta-qt5: update meta layer
automotive: update revisions
Conflicts:
recipes-qt/automotive/gammaray_git.bb
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
recipes-qt/qt5/qtquickcompiler_git.bb
scripts/manifest.xml
Change-Id: I73e99cd51cbe5f87021c02c19c12b6661a42c01b
Diffstat (limited to 'recipes-qt/qt5-addons')
-rw-r--r-- | recipes-qt/qt5-addons/installer-framework_3.0.1.bb (renamed from recipes-qt/qt5-addons/installer-framework_2.0.3.bb) | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb index 0ea0ec4..5bc09c0 100644 --- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb +++ b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2017 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -33,10 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" | |||
33 | 33 | ||
34 | inherit bin_package native | 34 | inherit bin_package native |
35 | 35 | ||
36 | SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z" | 36 | do_unpack[depends] += "p7zip-native:do_populate_sysroot" |
37 | 37 | ||
38 | SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d" | 38 | SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z" |
39 | SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6" | 39 | |
40 | SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6" | ||
41 | SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498" | ||
40 | 42 | ||
41 | S = "${WORKDIR}/ifw-pkg" | 43 | S = "${WORKDIR}/ifw-pkg" |
42 | 44 | ||