aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-10-04 18:56:25 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-10-06 09:24:39 +0300
commit6cd56e9d754b304bd0004b779ad55465e2c2efe0 (patch)
tree0eb9e7150ceee4b2562b9f97d6e8f3432b921cc9
parente754f28566467659fc2d884d0569cd22f21c0340 (diff)
qt6: update submodulesv6.0.0-alpha
Change-Id: Ia2b6d4870e71fb98c0e3a274900db8e9a1a63d5c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--recipes-qt/qt6/qt3d_git.bb2
-rw-r--r--recipes-qt/qt6/qt5compat_git.bb2
-rw-r--r--recipes-qt/qt6/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt6/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt6/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt6/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt6/qtquicktimeline_git.bb2
-rw-r--r--recipes-qt/qt6/qtshadertools_git.bb2
-rw-r--r--recipes-qt/qt6/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt6/qttools_git.bb2
-rw-r--r--recipes-qt/qt6/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt6/qtwayland/0001-Fix-compilation-after-mime-data-API-changes.patch41
-rw-r--r--recipes-qt/qt6/qtwayland_git.bb3
13 files changed, 12 insertions, 54 deletions
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb
index 9dfb000..a9eff0c 100644
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "88ac9513465d900f135da8cec94db2634ee63a3d"
+SRCREV_qt3d = "3166eed9ec9883cb0df5ecc4fbeae68760bb5a58"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb
index 8815a8d..a8ee996 100644
--- a/recipes-qt/qt6/qt5compat_git.bb
+++ b/recipes-qt/qt6/qt5compat_git.bb
@@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS += "qtbase"
-SRCREV = "f0af3eb5591c26b40454362c492a155282a8536f"
+SRCREV = "763b161a906f382db4ec3940898b735ab27d7408"
diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb
index 5164471..fda2744 100644
--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
-SRCREV = "c1801de214ae82798ea420d687227a78fa81b8b8"
+SRCREV = "7b41d70512359aa905d7ffec6301fda944d63a86"
diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb
index a69206c..31ed92e 100644
--- a/recipes-qt/qt6/qtnetworkauth_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth_git.bb
@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
-SRCREV = "fa14a2f743269c3d35820bb855f8d6bd616bd8e8"
+SRCREV = "c5218fd04a1600250f88a023915e479579f5b2a2"
diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb
index 880ddce..3b80550 100644
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@@ -25,5 +25,5 @@ _FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "b31e7a6dcd4c86605400e3697dffd52a64253c72"
+SRCREV_qtquick3d = "82a2d34faa7c7fa2f3fcfce145d375d5edce4fef"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb
index de5af4c..f396a94 100644
--- a/recipes-qt/qt6/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt6/qtquickcontrols2_git.bb
@@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
-SRCREV = "fbc629892461662a20e12c38f182fddb1fcc3a81"
+SRCREV = "cd669f1f216e54fa59eee77459d608a41f5df290"
diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb
index 7564bb6..d356707 100644
--- a/recipes-qt/qt6/qtquicktimeline_git.bb
+++ b/recipes-qt/qt6/qtquicktimeline_git.bb
@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
-SRCREV = "56d474c4eabb80e8b8de5e18d144a5cb15485027"
+SRCREV = "395c79681b630e6f99838222074d0398e801adcb"
diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb
index 2a29fe5..dcaa836 100644
--- a/recipes-qt/qt6/qtshadertools_git.bb
+++ b/recipes-qt/qt6/qtshadertools_git.bb
@@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
-SRCREV = "23148650918e540064c080eccb3fcb2d8177089d"
+SRCREV = "c3a93290c8f49965da4e1d4c06fbbdf6f497dd8f"
diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb
index 1673f6b..cbd8a0d 100644
--- a/recipes-qt/qt6/qtsvg_git.bb
+++ b/recipes-qt/qt6/qtsvg_git.bb
@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
-SRCREV = "e09b8bdd112dd70933b1dbceb702037b77cf4386"
+SRCREV = "494c555d392078f9cfc158496149731ca67d931c"
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index 83a54cd..3778049 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
-SRCREV = "8a2b3132e99203b5f46a57b07efe7afc1089ca36"
+SRCREV = "c4e1721c2431b5fb3500e77c3f0e1cd2c0fcd1b7"
diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb
index 0b62583..206a5e3 100644
--- a/recipes-qt/qt6/qttranslations_git.bb
+++ b/recipes-qt/qt6/qttranslations_git.bb
@@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
-SRCREV = "1655aacfbe31af01849d30db95ef4367b5e3f0a3"
+SRCREV = "463a8c3c87a0be093d11e1e4bfdd24b270351ecc"
diff --git a/recipes-qt/qt6/qtwayland/0001-Fix-compilation-after-mime-data-API-changes.patch b/recipes-qt/qt6/qtwayland/0001-Fix-compilation-after-mime-data-API-changes.patch
deleted file mode 100644
index e1fa907..0000000
--- a/recipes-qt/qt6/qtwayland/0001-Fix-compilation-after-mime-data-API-changes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5febdf595e514be41480a997cc606570e704fb6c Mon Sep 17 00:00:00 2001
-From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-Date: Mon, 28 Sep 2020 12:11:27 +0200
-Subject: [PATCH] Fix compilation after mime data API changes
-
-Follows 848927b688d4709d0b71590518e2c32fe7866147 in qtbase,
-where the signature of retrieveData_sys() was changed.
-
-Fixes: QTBUG-87003
-Change-Id: I8b88c8f9547e599328f40345a9fbf57c07ec31a4
----
- src/client/qwaylanddataoffer.cpp | 2 +-
- src/client/qwaylanddataoffer_p.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
-index 2297e8a1..5d0a8d47 100644
---- a/src/client/qwaylanddataoffer.cpp
-+++ b/src/client/qwaylanddataoffer.cpp
-@@ -124,7 +124,7 @@ QStringList QWaylandMimeData::formats_sys() const
- return m_types;
- }
-
--QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QVariant::Type type) const
-+QVariant QWaylandMimeData::retrieveData_sys(const QString &mimeType, QMetaType type) const
- {
- Q_UNUSED(type);
-
-diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
-index 9cf1483c..50c05732 100644
---- a/src/client/qwaylanddataoffer_p.h
-+++ b/src/client/qwaylanddataoffer_p.h
-@@ -106,7 +106,7 @@ public:
- protected:
- bool hasFormat_sys(const QString &mimeType) const override;
- QStringList formats_sys() const override;
-- QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const override;
-+ QVariant retrieveData_sys(const QString &mimeType, QMetaType type) const override;
-
- private:
- int readData(int fd, QByteArray &data) const;
diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb
index 1da2161..599afea 100644
--- a/recipes-qt/qt6/qtwayland_git.bb
+++ b/recipes-qt/qt6/qtwayland_git.bb
@@ -14,7 +14,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
- file://0001-Fix-compilation-after-mime-data-API-changes.patch \
"
PACKAGECONFIG ?= "\
@@ -38,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
-SRCREV = "7ae0ccc3fcd565da0d36ad07ffd67bce5d75df07"
+SRCREV = "e823131e6fbd3e6e4c089b0ec860285cc4994195"