qt5: update submodules

Change-Id: I9bef45d49ce22943476b1de259b8d2fb71944b58
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-03-08 15:54:06 +02:00
parent fe0c4887c3
commit d90472ab6c
26 changed files with 46 additions and 45 deletions

View File

@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "a6be8fc20182d83bc464f9485806bd546df1565e"
SRCREV_qt3d = "9c9284ce7f0d4ea3dda6d6bc6b602f5d4d6016d4"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"

View File

@ -17,4 +17,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
SRCREV = "8136911e73be7030a2a089decec9a37cc02313c8"
SRCREV = "e0bc5503821f33c13739ef3d5761f7b9f8d0f8c5"

View File

@ -1,4 +1,4 @@
From ddf6b576c9d5024b8b1a7ceaf9a4b1c26afa3b19 Mon Sep 17 00:00:00 2001
From caa84d6daf7d1d1400d96b4c342927056dfe06a0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
Subject: [PATCH] Add linux-oe-g++ platform
@ -48,18 +48,18 @@ index 55a51293ac..7b7a8758eb 100644
# run qmlimportscanner
qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 7777e615bd..8d792fa70a 100644
index dd780ad556..692e1fc621 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -87,7 +87,7 @@ defineTest(qtHaveModule) {
defineTest(qtPrepareTool) {
@@ -91,7 +91,7 @@ defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
- cmd = $$[QT_HOST_BINS]/$$2
+ cmd = $$[QT_HOST_BINS/get]/$$2
exists($${cmd}.pl) {
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
isEmpty(5) {
- instloc = $$[QT_HOST_BINS]
+ instloc = $$[QT_HOST_BINS/get]
} else {
instloc = $$5
}
diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
new file mode 100644
index 0000000000..99ff3741d3

View File

@ -1,4 +1,4 @@
From dbbb5f6695c4fb8e01842ddb0b0690f60b62e061 Mon Sep 17 00:00:00 2001
From 99262593f035192b95cfa9f3ee643405bef7e307 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@ -16,22 +16,23 @@ Upstream-Status: Inappropriate [embedded specific]
Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/corelib/global/qlibraryinfo.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
src/corelib/global/qlibraryinfo.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index a86436f4c8..c5856f6750 100644
index b48b1b5d95..a4d70b4b6f 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -181,7 +181,10 @@ void QLibrarySettings::load()
@@ -131,7 +131,11 @@ void QLibrarySettings::load()
QSettings *QLibraryInfoPrivate::findConfiguration()
{
#ifdef QT_BUILD_QMAKE
- QString qtconfig = qmake_libraryInfoFile();
- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
+ QString qtconfig = QFile::decodeName(config);
+ if(qtconfig.isEmpty() || !QFile::exists(qtconfig))
+ qtconfig = qmake_libraryInfoFile();
if (!qtconfig.isEmpty())
+ if (QFile::exists(qtconfig))
+ return new QSettings(qtconfig, QSettings::IniFormat);
+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
if (QFile::exists(qtconfig))
return new QSettings(qtconfig, QSettings::IniFormat);
#else
#ifdef Q_OS_DARWIN

View File

@ -152,4 +152,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "9a5a2d61c077ddc8a0fb4e2cce7a36a5dbb081d5"
SRCREV = "4f37cf2ce544dad5b207161536566627b6b0b1ef"

View File

@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "55edf2a7d7b12816f297c7ac0febe034af722f99"
SRCREV = "697717f863518652a2fea487bee826934b8289e5"

View File

@ -12,4 +12,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
SRCREV = "a55e4d7238d9dde0449e95dd1342fa6d61efdc9d"
SRCREV = "cb31a8b1284a5a5333c0b2d1228d99a461cd15a0"

View File

@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "433b4c7a93817309d23cb006a4cfe80aad82a0bc"
SRCREV = "e73fdf23da12884ff8df6c9f23add8d2758ae446"

View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "e9ac81ab78bedd7618cce8ac051b209385038f48"
SRCREV = "1cf0c1193ad2ff8812baa36e68ca81872d7d3d40"

View File

@ -8,4 +8,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
RDEPENDS_${PN} = "connman"
SRCREV = "77987a087507ecccb616a1af158190ffd3082a02"
SRCREV = "a04282a5bc0f128e4b98fddfd48af6a54e36b6e5"

View File

@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
SRCREV = "90b7357ddf51e5c26a1e4e09851ef799d26bfe43"
SRCREV = "3dfd4dd8068284465302ecc46cc024e62a931d1a"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "e5357c6704f29246bd73cea3b3de4f6a15a362ec"
SRCREV = "7870372067d699c8b35cee5801e315a9759e009f"

View File

@ -13,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "41f07419638e2acb6faee2707728f46f6333c479"
SRCREV = "42f7adf1082a602bf50b5cb842b57c46f23c7064"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "0b32d73691f06908a6a45b787b33adb8e4c86a3b"
SRCREV = "84b1d352aeb899875b01cdcc84b81a6c84d2c500"

View File

@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "01cd5ac03166217c55d138267b2fa6a2541b9d1c"
SRCREV = "a4e1d761af759c7a60ece819754cade7c0d2981f"

View File

@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "d094818c3451647b623be28139f6962851e5dd23"
SRCREV_assimp = "d40f0390e3ba6dd053ae411630307ccb88c8064b"
SRCREV_qtquick3d = "5a7c74038452f5a3e901220f8550982181c2a062"
SRCREV_assimp = "75144dd7fd9581888223041f62244d86198d5dca"

View File

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "0c41aefa6fb2f49066e2833ba1466d35585d2910"
SRCREV = "f180ffcab5115ae82ce6e696546be901f91e370d"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "2b8ca69c03eb16b6e45bbb06b49b5087d2d77e3d"
SRCREV = "6be9ba0f0aba2662813db7c8b682b9fe52df5e6e"

View File

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "76a57dfe9fe96d03fb41280e0eaecd9927b94a32"
SRCREV = "94e75b8b0ce02a24bec2b7309615f2638e37a1ce"

View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "1aaaa4997f0deb69af76793620443218ab0459f3"
SRCREV = "98d03b9cdff584d6c99fde2192e043e015ed3ebd"

View File

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "4baa783f8baeefbead2a3270d9a02dd1767f4ceb"
SRCREV = "1ec24334c08efd8b670240d0e80254960ef2bdd0"

View File

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "963e2322c1793db87b8c290e2e68640260891845"
SRCREV = "43c51eb39266ab16c47e2020c513d7cc0d5f2245"

View File

@ -18,4 +18,4 @@ FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "a6a22831aca7d21fdf253bea6d1b0fe0c39e65ae"
SRCREV = "0b37b1bf1d5217b6a4fd01af77a300cc71884867"

View File

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "8fd7e41f5a0e4501ba40631ef96a0dcdecfc13d7"
SRCREV = "5d8adb072920813c85d9ded0fd064b29d957e277"

View File

@ -116,4 +116,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "88daa12108fe4a9a7f46918b7a080c76f97a215f"
SRCREV = "2e4201f9bd37406e51973da5ec71d90bfe3cb2c5"

View File

@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "1bea127170ed1379087164dfa1971f65bc3b8d3f"
SRCREV = "2247df7f18c05101eca1d11b04d7734b7c0920aa"