diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-10-24 14:28:45 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-10-26 05:55:39 +0000 |
| commit | ee1cee8b3b04e9fa352fbb0ad647e1ee1855832a (patch) | |
| tree | 9c62cf9dce57c1e6955504dd9259f8ac135d6cce /recipes-qt/qt5/qtbase_git.bb | |
| parent | 12957b63ceab505714cc49d8661ef62b327313ae (diff) | |
| parent | 41a2d0e65575721ef8e44dd0975e5b477688c8aa (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
All the CVEs naturally already included, effective changes are
the last two commits listed in the changelog below.
Changelog:
41a2d0e6 qtbase: Refresh direct import patches with devtool
2a64bf65 qtbase: Pick CVE-2023-43114 fix
a77ea023 qtbase: Pick CVE-2023-38197 fix
7c405994 qtbase: Pick CVE-2023-37369 fix
c75c6ac9 qtbase: Pick CVE-2023-34410 fix
51cd2acf qtbase: Pick CVE-2023-33285 fix
002d27e9 qtbase: Pick CVE-2023-32763 fix
107e5138 qtsvg: Refresh direct import patches with devtool
4302ed02 qtsvg: Pick CVE-2023-32573 fix
b06461fc qtbase: CVE-2023-32762 Network incorrectly parses the header allowing unencrypted connectionns
0a9c9b64 qtbase: Add unixodbc as dependency of sql-odbc
77901f19 python3-pyqt5: remove bashism from recipe
Conflicts:
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtsvg_git.bb
Change-Id: I1fc9da687949b4c0bb4325e937cd55450b938fa7
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2114fa91..d304de70 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -119,7 +119,7 @@ PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -no-bundled-xcb-xinput -DUSE_X11=ON,-no-xcb PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5" PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" -PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" +PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc,unixodbc" PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" |