aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Montefoschi <francesco.monte@gmail.com>2024-04-03 15:31:43 +0200
committerMartin Jansa <martin.jansa@gmail.com>2024-04-05 08:22:05 +0200
commit890b716d92a49a43f8c6893a0d6c577064ebab02 (patch)
tree705e1f1ca1a8b117058afe4708f2ea588af641a0
parentb8e1ae8ce6140f6084388842751280b55d55988b (diff)
qt5: upgrade to v5.15.13-lts-lgpl
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0026-qsql_odbc-Patch-for-CVE-2023-24607.patch345
-rw-r--r--recipes-qt/qt5/qtbase_git.bb3
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtquicktimeline_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch4
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
38 files changed, 38 insertions, 384 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 76b41bdd..1a5cfcc9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -201,4 +201,4 @@ fakeroot do_generate_qt_environment_file() {
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
-SRCREV = "e4391422574aa9aa89fece74f16c07c609cbbae2"
+SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 23a28569..aeb2c3d5 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -44,7 +44,7 @@ do_configure:prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
-SRCREV = "e1b1a0d2970fd384bd52c734a72536d8452ad070"
+SRCREV = "67bee4599a28e1cadc14ed9ea4adc7061e250b90"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qt3d_assimp"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 5836e2c8..b4179007 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -14,4 +14,4 @@ CVE_PRODUCT:append = " qt"
S = "${WORKDIR}/git"
-PV = "5.15.12+git${SRCPV}"
+PV = "5.15.13+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6b307afd..52bd9c86 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -146,4 +146,4 @@ do_install() {
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
-SRCREV = "e4391422574aa9aa89fece74f16c07c609cbbae2"
+SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a"
diff --git a/recipes-qt/qt5/qtbase/0026-qsql_odbc-Patch-for-CVE-2023-24607.patch b/recipes-qt/qt5/qtbase/0026-qsql_odbc-Patch-for-CVE-2023-24607.patch
deleted file mode 100644
index 7168c2be..00000000
--- a/recipes-qt/qt5/qtbase/0026-qsql_odbc-Patch-for-CVE-2023-24607.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From 6873643ac7cba4338336a613cbe3d6fee8f26248 Mon Sep 17 00:00:00 2001
-From: Charlie Johnston <charlie.johnston@ni.com>
-Date: Fri, 23 Jun 2023 12:04:16 -0500
-Subject: [PATCH] qsql_odbc: Patch for CVE-2023-24607
-
-The fix for CVE-2023-24607 was only applied to qtbase
-5.15.13 and later. This backports the patch to versions
-of qtbase that are available in the GitHub meta-qt5 fork.
-
-CVE: CVE-2023-24607
-
-Signed-off-by: Charlie Johnston <charlie.johnston@ni.com>
-Upstream-Status: Backport
----
- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 206 +++++++++++++---------
- 1 file changed, 118 insertions(+), 88 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-index 5f51de3843..6cac60d03d 100644
---- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
-@@ -92,23 +92,39 @@ inline static QString fromSQLTCHAR(const QVarLengthArray<SQLTCHAR>& input, int s
- return result;
- }
-
-+template <size_t SizeOfChar = sizeof(SQLTCHAR)>
-+void toSQLTCHARImpl(QVarLengthArray<SQLTCHAR> &result, const QString &input); // primary template undefined
-+
-+template <typename Container>
-+void do_append(QVarLengthArray<SQLTCHAR> &result, const Container &c)
-+{
-+ result.append(reinterpret_cast<const SQLTCHAR *>(c.data()), c.size());
-+}
-+
-+template <>
-+void toSQLTCHARImpl<1>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+ const auto u8 = input.toUtf8();
-+ do_append(result, u8);
-+}
-+
-+template <>
-+void toSQLTCHARImpl<2>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+ do_append(result, input);
-+}
-+
-+template <>
-+void toSQLTCHARImpl<4>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
-+{
-+ const auto u32 = input.toUcs4();
-+ do_append(result, u32);
-+}
-+
- inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input)
- {
- QVarLengthArray<SQLTCHAR> result;
-- result.resize(input.size());
-- switch(sizeof(SQLTCHAR)) {
-- case 1:
-- memcpy(result.data(), input.toUtf8().data(), input.size());
-- break;
-- case 2:
-- memcpy(result.data(), input.unicode(), input.size() * 2);
-- break;
-- case 4:
-- memcpy(result.data(), input.toUcs4().data(), input.size() * 4);
-- break;
-- default:
-- qCritical("sizeof(SQLTCHAR) is %d. Don't know how to handle this.", int(sizeof(SQLTCHAR)));
-- }
-+ toSQLTCHARImpl(result, input);
- result.append(0); // make sure it's null terminated, doesn't matter if it already is, it does if it isn't.
- return result;
- }
-@@ -763,6 +779,14 @@ QChar QODBCDriverPrivate::quoteChar()
- return quote;
- }
-
-+static SQLRETURN qt_string_SQLSetConnectAttr(SQLHDBC handle, SQLINTEGER attr, const QString &val)
-+{
-+ auto encoded = toSQLTCHAR(val);
-+ return SQLSetConnectAttr(handle, attr,
-+ encoded.data(),
-+ SQLINTEGER(encoded.size() * sizeof(SQLTCHAR))); // size in bytes
-+}
-+
-
- bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
- {
-@@ -798,10 +822,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
- v = val.toUInt();
- r = SQLSetConnectAttr(hDbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) size_t(v), 0);
- } else if (opt.toUpper() == QLatin1String("SQL_ATTR_CURRENT_CATALOG")) {
-- val.utf16(); // 0 terminate
-- r = SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG,
-- toSQLTCHAR(val).data(),
-- val.length()*sizeof(SQLTCHAR));
-+ r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG, val);
- } else if (opt.toUpper() == QLatin1String("SQL_ATTR_METADATA_ID")) {
- if (val.toUpper() == QLatin1String("SQL_TRUE")) {
- v = SQL_TRUE;
-@@ -816,10 +837,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
- v = val.toUInt();
- r = SQLSetConnectAttr(hDbc, SQL_ATTR_PACKET_SIZE, (SQLPOINTER) size_t(v), 0);
- } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACEFILE")) {
-- val.utf16(); // 0 terminate
-- r = SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE,
-- toSQLTCHAR(val).data(),
-- val.length()*sizeof(SQLTCHAR));
-+ r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE, val);
- } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACE")) {
- if (val.toUpper() == QLatin1String("SQL_OPT_TRACE_OFF")) {
- v = SQL_OPT_TRACE_OFF;
-@@ -1022,9 +1040,12 @@ bool QODBCResult::reset (const QString& query)
- return false;
- }
-
-- r = SQLExecDirect(d->hStmt,
-- toSQLTCHAR(query).data(),
-- (SQLINTEGER) query.length());
-+ {
-+ auto encoded = toSQLTCHAR(query);
-+ r = SQLExecDirect(d->hStmt,
-+ encoded.data(),
-+ SQLINTEGER(encoded.size()));
-+ }
- if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r!= SQL_NO_DATA) {
- setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
- "Unable to execute statement"), QSqlError::StatementError, d));
-@@ -1371,9 +1392,12 @@ bool QODBCResult::prepare(const QString& query)
- return false;
- }
-
-- r = SQLPrepare(d->hStmt,
-- toSQLTCHAR(query).data(),
-- (SQLINTEGER) query.length());
-+ {
-+ auto encoded = toSQLTCHAR(query);
-+ r = SQLPrepare(d->hStmt,
-+ encoded.data(),
-+ SQLINTEGER(encoded.size()));
-+ }
-
- if (r != SQL_SUCCESS) {
- setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
-@@ -1401,7 +1425,7 @@ bool QODBCResult::exec()
- SQLCloseCursor(d->hStmt);
-
- QVector<QVariant>& values = boundValues();
-- QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // holds temporary buffers
-+ QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // targets for SQLBindParameter()
- QVarLengthArray<SQLLEN, 32> indicators(values.count());
- memset(indicators.data(), 0, indicators.size() * sizeof(SQLLEN));
-
-@@ -1580,35 +1604,36 @@ bool QODBCResult::exec()
- case QVariant::String:
- if (d->unicode) {
- QByteArray &ba = tmpStorage[i];
-- QString str = val.toString();
-+ {
-+ const auto encoded = toSQLTCHAR(val.toString());
-+ ba = QByteArray(reinterpret_cast<const char *>(encoded.data()),
-+ encoded.size() * sizeof(SQLTCHAR));
-+ }
-+
- if (*ind != SQL_NULL_DATA)
-- *ind = str.length() * sizeof(SQLTCHAR);
-- int strSize = str.length() * sizeof(SQLTCHAR);
-+ *ind = ba.size();
-
- if (bindValueType(i) & QSql::Out) {
-- const QVarLengthArray<SQLTCHAR> a(toSQLTCHAR(str));
-- ba = QByteArray((const char *)a.constData(), a.size() * sizeof(SQLTCHAR));
- r = SQLBindParameter(d->hStmt,
- i + 1,
- qParamType[bindValueType(i) & QSql::InOut],
- SQL_C_TCHAR,
-- strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-+ ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
- 0, // god knows... don't change this!
- 0,
-- ba.data(),
-+ const_cast<char *>(ba.constData()), // don't detach
- ba.size(),
- ind);
- break;
- }
-- ba = QByteArray ((const char *)toSQLTCHAR(str).constData(), str.size()*sizeof(SQLTCHAR));
- r = SQLBindParameter(d->hStmt,
- i + 1,
- qParamType[bindValueType(i) & QSql::InOut],
- SQL_C_TCHAR,
-- strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-- strSize,
-+ ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
-+ ba.size(),
- 0,
-- const_cast<char *>(ba.constData()),
-+ const_cast<char *>(ba.constData()), // don't detach
- ba.size(),
- ind);
- break;
-@@ -1716,10 +1741,11 @@ bool QODBCResult::exec()
- case QVariant::String:
- if (d->unicode) {
- if (bindValueType(i) & QSql::Out) {
-- const QByteArray &first = tmpStorage.at(i);
-- QVarLengthArray<SQLTCHAR> array;
-- array.append((const SQLTCHAR *)first.constData(), first.size());
-- values[i] = fromSQLTCHAR(array, first.size()/sizeof(SQLTCHAR));
-+ const QByteArray &bytes = tmpStorage.at(i);
-+ const auto strSize = bytes.size() / int(sizeof(SQLTCHAR));
-+ QVarLengthArray<SQLTCHAR> string(strSize);
-+ memcpy(string.data(), bytes.data(), strSize * sizeof(SQLTCHAR));
-+ values[i] = fromSQLTCHAR(string);
- }
- break;
- }
-@@ -1966,14 +1992,16 @@ bool QODBCDriver::open(const QString & db,
- SQLSMALLINT cb;
- QVarLengthArray<SQLTCHAR> connOut(1024);
- memset(connOut.data(), 0, connOut.size() * sizeof(SQLTCHAR));
-- r = SQLDriverConnect(d->hDbc,
-- NULL,
-- toSQLTCHAR(connQStr).data(),
-- (SQLSMALLINT)connQStr.length(),
-- connOut.data(),
-- 1024,
-- &cb,
-- /*SQL_DRIVER_NOPROMPT*/0);
-+ {
-+ auto encoded = toSQLTCHAR(connQStr);
-+ r = SQLDriverConnect(d->hDbc,
-+ nullptr,
-+ encoded.data(), SQLSMALLINT(encoded.size()),
-+ connOut.data(),
-+ 1024,
-+ &cb,
-+ /*SQL_DRIVER_NOPROMPT*/0);
-+ }
-
- if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
- setLastError(qMakeError(tr("Unable to connect"), QSqlError::ConnectionError, d));
-@@ -2352,17 +2380,15 @@ QStringList QODBCDriver::tables(QSql::TableType type) const
- if (tableType.isEmpty())
- return tl;
-
-- QString joinedTableTypeString = tableType.join(QLatin1Char(','));
-+ {
-+ auto joinedTableTypeString = toSQLTCHAR(tableType.join(u','));
-
-- r = SQLTables(hStmt,
-- NULL,
-- 0,
-- NULL,
-- 0,
-- NULL,
-- 0,
-- toSQLTCHAR(joinedTableTypeString).data(),
-- joinedTableTypeString.length() /* characters, not bytes */);
-+ r = SQLTables(hStmt,
-+ nullptr, 0,
-+ nullptr, 0,
-+ nullptr, 0,
-+ joinedTableTypeString.data(), joinedTableTypeString.size());
-+ }
-
- if (r != SQL_SUCCESS)
- qSqlWarning(QLatin1String("QODBCDriver::tables Unable to execute table list"), d);
-@@ -2436,28 +2462,30 @@ QSqlIndex QODBCDriver::primaryIndex(const QString& tablename) const
- SQL_ATTR_CURSOR_TYPE,
- (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
- SQL_IS_UINTEGER);
-- r = SQLPrimaryKeys(hStmt,
-- catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
-- catalog.length(),
-- schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
-- schema.length(),
-- toSQLTCHAR(table).data(),
-- table.length() /* in characters, not in bytes */);
-+ {
-+ auto c = toSQLTCHAR(catalog);
-+ auto s = toSQLTCHAR(schema);
-+ auto t = toSQLTCHAR(table);
-+ r = SQLPrimaryKeys(hStmt,
-+ catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+ schema.isEmpty() ? nullptr : s.data(), s.size(),
-+ t.data(), t.size());
-+ }
-
- // if the SQLPrimaryKeys() call does not succeed (e.g the driver
- // does not support it) - try an alternative method to get hold of
- // the primary index (e.g MS Access and FoxPro)
- if (r != SQL_SUCCESS) {
-- r = SQLSpecialColumns(hStmt,
-- SQL_BEST_ROWID,
-- catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
-- catalog.length(),
-- schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
-- schema.length(),
-- toSQLTCHAR(table).data(),
-- table.length(),
-- SQL_SCOPE_CURROW,
-- SQL_NULLABLE);
-+ auto c = toSQLTCHAR(catalog);
-+ auto s = toSQLTCHAR(schema);
-+ auto t = toSQLTCHAR(table);
-+ r = SQLSpecialColumns(hStmt,
-+ SQL_BEST_ROWID,
-+ catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+ schema.isEmpty() ? nullptr : s.data(), s.size(),
-+ t.data(), t.size(),
-+ SQL_SCOPE_CURROW,
-+ SQL_NULLABLE);
-
- if (r != SQL_SUCCESS) {
- qSqlWarning(QLatin1String("QODBCDriver::primaryIndex: Unable to execute primary key list"), d);
-@@ -2538,15 +2566,17 @@ QSqlRecord QODBCDriver::record(const QString& tablename) const
- SQL_ATTR_CURSOR_TYPE,
- (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
- SQL_IS_UINTEGER);
-- r = SQLColumns(hStmt,
-- catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
-- catalog.length(),
-- schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
-- schema.length(),
-- toSQLTCHAR(table).data(),
-- table.length(),
-- NULL,
-- 0);
-+ {
-+ auto c = toSQLTCHAR(catalog);
-+ auto s = toSQLTCHAR(schema);
-+ auto t = toSQLTCHAR(table);
-+ r = SQLColumns(hStmt,
-+ catalog.isEmpty() ? nullptr : c.data(), c.size(),
-+ schema.isEmpty() ? nullptr : s.data(), s.size(),
-+ t.data(), t.size(),
-+ nullptr,
-+ 0);
-+ }
- if (r != SQL_SUCCESS)
- qSqlWarning(QLatin1String("QODBCDriver::record: Unable to execute column list"), d);
-
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 4a861dfc..dc71fa95 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -37,7 +37,6 @@ SRC_URI += "\
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
file://0023-Remove-unsetting-_FILE_OFFSET_BITS.patch \
- file://0026-qsql_odbc-Patch-for-CVE-2023-24607.patch \
file://CVE-2023-32762.patch \
file://CVE-2023-32763-qtbase-5.15.diff \
file://CVE-2023-33285-qtbase-5.15.diff \
@@ -320,4 +319,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
-SRCREV = "e4391422574aa9aa89fece74f16c07c609cbbae2"
+SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 3e0d1ba5..b7d5616b 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
-SRCREV = "393a84ad5b16a9ec93d8a44bebf1ae86e881bc06"
+SRCREV = "3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index cb89027c..5c4bb963 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "45604bedf6d3b022fc9758eeb4cefab0f9f2dea5"
+SRCREV = "f1fed9fb2a7e5b877d8408f92040651b0cf47dbb"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index a883553e..dacfe51a 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
-SRCREV = "c887477198cae44585fe9db371db0ddf4c3b205e"
+SRCREV = "6ac6d23a8f558f36f1162b419858cc44dccd4d2b"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5b7a8dfc..48a4c697 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -53,6 +53,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
-SRCREV = "105e610548a62d943301153afb337a49f14e9e25"
+SRCREV = "6ab9856ef379fc3fe44d5fac03a83f679f398511"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 34849305..642f8f86 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "8ed95136b3c265b01db6cc33869228f41878e173"
+SRCREV = "44255e2ae53a14e9a3fb671da0782ec5d396220a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 7b78ba55..ef72bf84 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS:${PN}-dev = ""
# http://errors.yoctoproject.org/Errors/Build/44912/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SRCREV = "e33716bd6bb8926688fef20cb568e11618d08a35"
+SRCREV = "895f9753940156dda05aa83d3c7655571514407e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 86834f01..9a8dabc7 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "1019058c497e33edef80d5cb120aa7d6a418a7c6"
+SRCREV = "3c2ad3eed6fc522ad809797747c8028b3dd4778a"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 53f77f64..f23b6420 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -36,7 +36,7 @@ SRC_URI += " \
file://0001-mapbox-gl-explicitly-include-cstdint-header.patch;patchdir=src/3rdparty/mapbox-gl-native \
"
-SRCREV_qtlocation = "b6d96559cb9f5e0d79936c89887ea924b2c3514a"
+SRCREV_qtlocation = "f6953a8d604b906b170fb4610e124e7c31260a18"
SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 70ed516f..93a97f07 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "db33cc9a4c0bad1006dbc9ed46d71b80ee284df3"
+SRCREV = "62f17bbc0ae8649178ac484afc434dbad16d6351"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index b081f936..f6cdb833 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -40,7 +40,7 @@ SRC_URI += "\
# http://errors.yoctoproject.org/Errors/Build/44914/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SRCREV = "5197ff9e91cabd90700cf0d36fb5e9e5793d7097"
+SRCREV = "374d71e29a142bd177cd5b1b7e29a4628085ddcb"
# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
do_install:append() {
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 6ce71c29..2d24ba75 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
-SRCREV = "3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d"
+SRCREV = "ed2291d454fac207f6b1555d30b9227e51be611b"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index c1691bb1..440a66d1 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "f563e7f2d1668a3d216e9d396e050df25fd15532"
+SRCREV = "7f4ead6f3e6431acee63987a0a1753ff140ac2d2"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 33febb4f..1c99f14e 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
-SRCREV_qtquick3d = "d29b769a7f9b0c106fc58c9fadd7c41379d14776"
+SRCREV_qtquick3d = "fbb8186383e7e3389b952c43781755346d5ce371"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 78d237c7..07ac0b6e 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native"
SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch"
-SRCREV = "7bd4fe4ca1d0c4eeb062ac98dcf15b036df04df6"
+SRCREV = "480694ae720490b162747b07aa0e0bb7e7abc7da"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index eb21c987..d61a1923 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
-SRCREV = "1ca962198a703f591efc7c8f7540fc4120746a00"
+SRCREV = "77fbfa8d313bbdb8fb762f15dd6173a067be55e3"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 88fd1738..234c760f 100644
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtbase qtdeclarative"
-SRCREV = "58f4f22662023efe6f223d5ef4a6d0be3708182b"
+SRCREV = "29394e35db43acb20e7b4d5e978a733f5b4232a6"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 589c1fe0..58d3f5f9 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "f64e34be9ac4b7e92c63e47235c04471a1d40c93"
+SRCREV = "29394e35db43acb20e7b4d5e978a733f5b4232a6"
BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 98010f62..018d8266 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
-SRCREV = "3f56c6b4bd1e3883581340243b4a7289807fffc9"
+SRCREV = "6074956c2089dd0507d2930c638fa8c930f4e21c"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
# 5.15.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 42b15783..3dc6da4b 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "3011b16d63cadbb473b6aa3a535b9f0e33170c09"
+SRCREV = "7f8b55744f87155a4979dd8ba405bd7feec03042"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 82d69e0d..363bba7a 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
-SRCREV = "c64de6ad9f646aaa66fca0500d21cde802a7bb17"
+SRCREV = "5efce7d821bad2f5db95ff3ada5eeddccbb58920"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index ad6000e1..83437e46 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "c3a7debff7a4c6ddaedb795290180dd99d7ac4be"
+SRCREV = "fc0b6affe244e40366bd624d6e01c62712568eb8"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 013f6631..d7992075 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "7b88174eb38ab1da4cb54f52734a01c7440def0d"
+SRCREV = "d44607f07fa66f0f5294c227eba99aac7c8dbebd"
SRC_URI += "\
file://CVE-2023-32573-qtsvg-5.15.diff \
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 9ba70ac7..cd6f2b96 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -43,7 +43,7 @@ EXTRA_QMAKEVARS_PRE += " \
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
"
-SRCREV = "e089fe78e2745f8316cadaa7492ab442c203b18d"
+SRCREV = "e8c3c391de17edce4542819c79de3d27a57ff408"
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 48bdf291..acb4f111 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES:${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
-SRCREV = "f7745c117041e7adf9705e1de8d71086c160dd9f"
+SRCREV = "40aabebd04a30ccef374bf20a7bfaa1d8d665b7f"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index f5c5db74..c1513a26 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -73,4 +73,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
-SRCREV = "8b885af5ad3c2f2ff500c060a41e312ea7276e50"
+SRCREV = "80565aa7fc37ecdb1c08e585d4ae3060618e3338"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 16df14bd..7dbe4f3f 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -49,7 +49,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "ec9fb19ead796d88bb9a67a4ddd269870cbacb54"
+SRCREV = "163ea1a04d1b00c95373d69e8c907e5789082d3e"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 5820298f..f869f279 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
-SRCREV = "47af6a4db5bc1faf3abf1152d7f0fdc2297387a1"
+SRCREV = "d5eb0142112b2b058e86489f7dae2e00c0aebe4c"
diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch
index 52dc8fbc..3a9174ad 100644
--- a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.X
CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package):
Could not find a configuration file for package "Qt5WebChannel" that is
- compatible with requested version "5.15.12".
+ compatible with requested version "5.15.13".
The following configuration files were considered but not accepted:
@@ -32,4 +32,4 @@ index 461e9c733..1d0279c42 100644
CONFIG += warning_clean
-MODULE_VERSION = 5.15.14
-+MODULE_VERSION = 5.15.12
++MODULE_VERSION = 5.15.13
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index bd36bc82..70130716 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure:prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
-SRCREV = "8f879e6bcf941a612c568fbfe2b49ddb1bb409cd"
+SRCREV = "80257933d3bf3a026455d71106e6b3e70dead765"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index a32dd259..b18c7943 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "4a67d49f565b90a827f35a2b090e196afe9accec"
+SRCREV = "6edf8323d14c531b12d5e818aa5923ca411fe6bf"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 060bf78f..98ece14d 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -23,4 +23,4 @@ python() {
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
}
-SRCREV = "53fa44709992faae54e4f5c8a128cea7b6f0cbd5"
+SRCREV = "3d9289d73c5c03ed5b2fe246589d0d81cfdaa22e"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 11a35169..6f04edd5 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "aaa54153970d1d63a44b873cad5f62ffa71ef9b8"
+SRCREV = "415ac0d58521be2bb00ef4cecdb16f0b9001e88c"