aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-03-14 09:39:09 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-03-14 09:40:15 +0200
commit78dffecae11a66c6de4efc8dfc7e5baa41c4e5c0 (patch)
tree5ea5969ac96f1841908899de794d735b0da36dc7
parent9e1a27d61c1cdea6d29e16b89a9d6be9720c3cab (diff)
parentde6be0d5ebd9c3a4683acbf602722950577fd7a4 (diff)
Merge remote-tracking branch 'origin/sumo' into thud
Cleanup merge of Boot2Qt 5.12.2 release into upcoming 5.13.0 beta1. Only Automotive module SHAs updated for the recipes via merge, no actual updates or changes for the Boot2Qt content. * origin/sumo: de6be0d meta-qt5: update layer 5883aa8 meta-qt5: update layer 0c4f960 meta-qt5: update layer f9d3da6 Merge remote-tracking branch 'origin/QtAS-5.12.1' into sumo 3e3f468 meta-qt5: update layer c20e297 Update Automotive submodules 3abf0f2 Update Automotive submodules 6c8952f Update Automotive submodules 5b259e7 Update automotive submodules a64eb55 Update automotive submodules 1e45043 Update automotive submodules 5f8fe3e Update automotive submodules 7d3669a Update Automotive SHAs Conflicts: scripts/manifest.xml Change-Id: Ie0b0a00f9141e6693cfa3bea76b213a2801d13e3
-rw-r--r--meta-boot2qt/recipes-qt/automotive/gammaray_git.bb2
-rw-r--r--meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb6
-rw-r--r--meta-boot2qt/recipes-qt/automotive/qmllive_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/automotive/qtivi_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb4
6 files changed, 12 insertions, 12 deletions
diff --git a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
index e92f00c5..2bccdca6 100644
--- a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb
@@ -9,7 +9,7 @@ inherit cmake_qt5
SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
BRANCH = "5.12"
-SRCREV = "6279cbaa86c2a66e15a5d1cc9df071912b44090c"
+SRCREV = "79a38d681fca747280eea885ac33d0193a4f5c9b"
PV = "${BRANCH}+git${SRCPV}"
DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \
diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
index ee26f08c..eac6bed3 100644
--- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb
@@ -1,7 +1,7 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Copyright (C) 2018 Pelagicore AG.
+## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2019 Pelagicore AG.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -45,7 +45,7 @@ SRC_URI += " \
file://neptune.service \
"
-SRCREV = "be372dec5a64cdfc2b2ba66ea240d9fa1cdbe3eb"
+SRCREV = "544a0f1b7493c28c3667e2cc18c4927af9ac2756"
QMAKE_PROFILES = "${S}/neptune3-ui.pro"
diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
index a0b49f6d..70bc71ac 100644
--- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc
QT_GIT_PROJECT = "qt-apps"
-SRCREV = "dc83ea3bcbcfece8a0c5caeafcdd9f0854ffae6f"
+SRCREV = "8d4da00654b0ad7c7f73bedb33480d0dfbad8926"
DEPENDS = "qtbase qtdeclarative"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
index 7c81fc58..ef356ba0 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -35,7 +35,7 @@ inherit qt5-module
require recipes-qt/qt5/qt5-git.inc
QT_MODULE_BRANCH = "dev"
-SRCREV = "9c4ff31161c2ea09c790ab143a23b3fe997ed4a3"
+SRCREV = "7a2543e5d81c315b7075ee4b5401becb199ae5e6"
DEPENDS = "qtbase qtdeclarative libyaml libarchive \
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
index cb3f6a36..067c3b4a 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -51,7 +51,7 @@ SRC_URI += " \
file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \
"
-SRCREV_qtivi = "b18956edd578f49f369f7b3863881d0fadb035df"
+SRCREV_qtivi = "9f86bd27564ada6bcd8e200f347b642578935934"
SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e"
SRCREV = "${SRCREV_qtivi}"
SRCREV_FORMAT = "qtivi_qface"
diff --git a/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
index ed299ac4..dada7a35 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc
QT_GIT_PROJECT = "qt-apps"
QT_MODULE_BRANCH = "dev"
-SRCREV = "09d629199fa153ea7954321d81f647d5eb52fb6c"
+SRCREV = "93637d1b4f32a1f73613f70b29544f232059d600"
DEPENDS = "qtbase qtdeclarative qtwebengine"