[qt5] update to 5.15.13 (#37358)

This commit is contained in:
Dr.-Ing. Carsten Grimm 2024-03-12 05:03:57 +01:00 committed by GitHub
parent 82185909a4
commit 55505cda67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
89 changed files with 330 additions and 499 deletions

View File

@ -1,6 +1,6 @@
{
"name": "qt5-3d",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-activeqt",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 ActiveQt Module - ActiveX components",
"license": null,
"supports": "windows",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-androidextras",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 androidextras Module;",
"license": null,
"supports": "android",

View File

@ -1,53 +1,53 @@
# Every update requires an update of these hashes and the version within the control file of each of the 32 ports.
# So it is probably better to have a central location for these hashes and let the ports update via a script
set(QT_MAJOR_MINOR_VER 5.15)
set(QT_PATCH_VER 12)
set(QT_PATCH_VER 13)
set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland)
set(QT_HASH_qt5-3d fe66aebdfda50c75f588d5dfc1c48c4d39c1e7aa29ee342178016a10ca24dfa00284f89839810121d15aac40d47fcd471f7a3573892210a0abf14e247102a66d)
set(QT_HASH_qt5-activeqt 4afd89ccfb142dd72841d0d5129ef2175106c31b7a710ebd6f630cca18da2009b1fcd3b094e769f2ea24d4f67e9302441b8fdd80174823328fa3d22ad5957e7c)
set(QT_HASH_qt5-androidextras b181b8e42c19ca2946245cbcdbe19ba8c1fd1f9ab6988a6d1b920bb1895019372b529626789953722ccf28805f9171146d3bc38c3f0c72ed5511a1753ec38e00)
set(QT_HASH_qt5-base 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888)
set(QT_HASH_qt5-charts 543c9fe0dfd04f19407d3c11c2a1ed93da34b493cfb758b4b2a9e86a7325476e1f754de3281e366eff52e96d8f12fb44c9ff8f3e047069c409cb171687d11df4)
set(QT_HASH_qt5-connectivity 36cbdaf63e7f478a5bb1b51d14b8671a24251614fc99d07cab195a596a9b60f28dd013c5f2a3af914f655a12725b1e6e2318324393ee0f0586c746a1a670f224)
set(QT_HASH_qt5-datavis3d 6a734bd1e3296aaae94358e2315a7c4b033b113b27b9e1e75f0d888231c11c2fdf1caa17c40c4ed545ad8e4a735766368c1bf04e6b36e53ba3164f0f8d66a1c6)
set(QT_HASH_qt5-declarative 3ebe195dac22efa2e71a4520e4816592204431bc724d94a38d9f426424624990199f7e99b72c7d96f6ae324bb18b7eec89ea2b5db63ff2f1d24a997be25a0589)
set(QT_HASH_qt5-doc 46133676da2584c533bbe78d8eef12f2b1baa95e91168f7fa3400e58046c36a31064f6198f40e1679224da8824e642c6f610fba125b71e91399069019eaf68e6)
set(QT_HASH_qt5-gamepad 8a5f6c8fac4e7977b1c93efda698e27c6bc1e66b844f86642ae05ba104d8f14f30e6cb95ba4b3923e2e43d117af52354cfb5a6d35ffd159e29a336710fc63f93)
set(QT_HASH_qt5-graphicaleffects c0993082e96c5d8e26cc4e2e45320542d21fb7c716dfb6b087b385a985fff358cdff7e3d5d4ca3fc8fc9813e7c110165aa034d5e8d32e8082ad007b7bf929531)
set(QT_HASH_qt5-imageformats c56e70e17ed29ff126257ce41e2b9fd03807f0325ac60bd307779406dcea39ff929e49d2ea99ab17f07f19a6dda5f5103d4def6bb70a52f761141fc4b2c46e7c)
set(QT_HASH_qt5-location c480762cea2cd1a00e6061bab05c402d5aab2d12e7decebcd606c930d2029a93f2a46f8edbb188b73c7cdcad473b03c15037ea10e0b3538de0a99b1d7d7fb333)
set(QT_HASH_qt5-macextras 205fc0747dff5a7e8b199ccf82675484064e71c4267741fb1ae7ab4961436d8e645126dd548b9236f27f29379a297a1efce82a1f8589f081aadd752a9875034e)
set(QT_HASH_qt5-mqtt eaad1a8b8ad3f18181e5840dca725a9ac445ef0cdacb3eaffc682e145f6db2f4ffd1742329b2ea57653ba3d1a7168c3e9e531b9f48784ca2fef726197b4b50a4)
set(QT_HASH_qt5-multimedia 2cef917df20da1381ea64834e4110e25ea0d5e12249176ddbe2e0314c25490926ccbf2f7cc3f89b2969d113a645ec88244fabe691aff851ffb4b2be9766bcf76)
set(QT_HASH_qt5-networkauth f0c48453e21ad14a4fbac25d35e6257c4d8bbb5f2ac87dad0deee44ca86aec8def618f102cd1d9af05e1611f37ea722e1630165f15a238d3d8c38d161771bc3d)
set(QT_HASH_qt5-purchasing 5a5e8ca1de6155b20164e5f3e28daaed424afa05b1ddae3c07207e056183fb6dfce71a9de9c9c8ca1bb1e10ecb02139db79b0e5e701e8c11c6514274e21e5069)
set(QT_HASH_qt5-quickcontrols 980b233f83991d12029bac90b0875b3a001399d4358c58185a21bbb30911f0d6fec5dfc5f157e9c3c4d17e82c3ff5302e55c62b4cd63731f23a655bd55d300bb)
set(QT_HASH_qt5-quickcontrols2 725fb03907973fdca4479017b8f792110a4620a6e4d39f97c81c3be16280b81135394f6ce5be507fd734926307d33a249e790234139e01f387d2362cd7027128)
set(QT_HASH_qt5-remoteobjects fef775ccbc187064ef3e2cb73f9bc784c002bf74d89032a33767cb234ff40ea07eb5294eb919a50cede2afbf539e32c6c78df52817bc22a10617585e417c3690)
set(QT_HASH_qt5-script 48a00763686a5455d0429d1ecd6b32e3e96a13f05faa6625361c49b91275b8a8b3a1de3627cc3db5c69d346686c07b9466022cf37abf394a6f097933b9dbed4a)
set(QT_HASH_qt5-scxml c451fa8fc5999aa7e3b3a336503bcf1ccc8992ef27645d003c938166384508d2cc9b35fbd21e9da641ea98a2aaa58834ac85e8713bce25b96e4aef79c3cda976)
set(QT_HASH_qt5-sensors 25d4eb1ea43c5d7819a7b9cee22604b774007f84bdc86433f673766b1943134c5880be14ab06fac7f05fb2708491cb8b7e03f8656aae0d74538d732e31ffd917)
set(QT_HASH_qt5-serialbus d6571b6d54fe91ff945c0bd51bcecb97ae3d001ee3e1f30deb042a52bab17ad7e059ae943c0a3f2a4d6e7a952cb3f68b71275cef0fda1875fd233c8dc17d0d3c)
set(QT_HASH_qt5-serialport f27adbc07a3c3e946761e033105377ae26ac48d2c796f281947e950de1b7b9fb5a25627fd1a2c30cccd2de19181867cfd7d4a740a3318348e57885b5d96c7192)
set(QT_HASH_qt5-speech 960eb661cfeb8a4fc01337ac998bc8ce101da73782155e75a7b128987d9809fa1e4cc6fee30cfa3cbd39f7fff9bbe7e49e55430681ac6582e7c8110242d7183a)
set(QT_HASH_qt5-svg c68fa1bc8e3dc782a70049aeddca62731b48ff7de972d6e1a245b06d23c0795fd6a3e3538aa39a92016d5c15a068f7b8ae1d3b6bd950fb7857a7aa2ed556f857)
set(QT_HASH_qt5-tools d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e)
set(QT_HASH_qt5-translations 675e0902bbd6a1f910ffc0473e1e865239cf820886fff9ccc3c5cf69f6a9af862fa1e44d86538f2884f1a34ab433dc2615707487b426d56742bd26f8f0d9924a)
set(QT_HASH_qt5-virtualkeyboard 17c63ea6287f7dbc84c82762ea43da9fbb4d1c7281a4e81971c10eacfbfe7293a855dde35a37ed9c8cf5ccc289a0e1d0a0c970e6908cea5cae15f149b9f5e3c4)
set(QT_HASH_qt5-wayland acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66)
set(QT_HASH_qt5-webchannel 8b4f3c787e88a68a9b850c7c700e37b491ff17435871223fd70373a532e4d8c6d809d4b8ca0036b68f99852dbd80e21e45aa2ee2d89efffab1182fdf792d0d59)
set(QT_HASH_qt5-webengine 84ebdab10ea3138671c0612cc558dd3257264410d2776719c34d41b8f846424183742abc7185fa61c7bb3d35d471ab2341d064eec57b92c34e30325dbc3eff63)
set(QT_HASH_qt5-webglplugin 97670f47e582ec921c409b346f08bc70040a982811d9df967635900e4654b7069ca22ba5a6504b0f8a6b0022c317ffa71a3b60043212078d2b29cb1d2daf69ae)
set(QT_HASH_qt5-websockets 01195f4b2f11baa66e1b3d08148c234ac979d1a80be28d72b2bb8cd57f053102f432f59b7b89daa66d0e27c6e5ee792da12772d70c76aa88fa1bbe114b6f675a)
set(QT_HASH_qt5-webview eaabc534a116617dee0394afdb4d35525aa367d01d974c4759c02781a7e4af2fa2d096c638109b421d2b061df4476348d8471a9a02f6f05b97170366c973ef61)
set(QT_HASH_qt5-winextras da230ee9c9afccad83573a678c641f22f85ab45d7063406ef1b1922097b4b41fca9f1ca81256bba835e71a3f59f6280601f9fad3f7d5be74e436a242e3ef45eb)
set(QT_HASH_qt5-x11extras f346f399a79aece2635e3871d86302042834d17be143adbfa130ea91a6cd692211804c50e74cecb072a5d7c388f3fbf774b2b40b0fc86498b84552da7b213fe7)
set(QT_HASH_qt5-xmlpatterns 762c1c64e8ab269bf74de86f08afd50822859716024f3b13a70b719aeedfd35fd705fa03e32220f5cfab579361e754823d8bd584b30bde5965b026aa54b97142)
set(QT_HASH_qt5-3d 30bb061b13f91a8137e961948431b0ca697135a62c8f601eb0c65dc46f0a1f3e7d850141952f0b673a80002e8493289860d9b86840406e3e72fab4eb515688ad)
set(QT_HASH_qt5-activeqt 09aaf289be9136762934358083819ff0f6ceccd2e56699184ea4787cc51d0173b2581f316c9181d21a05bc6d80992867b40677998d436e370666bcd090ce7a8b)
set(QT_HASH_qt5-androidextras f5eae2dfd9ff92096b7b636ec3f23825d54303e2ebfd3f597ee9e7c5ecea3883cd8a11e81cba6d9a3e0d6884e60ff00551a51fc2c735d0ad5ca227de56850ff6)
set(QT_HASH_qt5-base 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef)
set(QT_HASH_qt5-charts a4ebdb7577683a68c960fee649ffac543528791daa88fd412ab5fdda3765719921cd4daebc49395c4108a3da2bafdbf8e08008fcced4c18b4d1a3acedb377796)
set(QT_HASH_qt5-connectivity 631947135a362b5a417b84702b3755588e5c7fe1c9cca5b523c8d8ca340b42f929aaf58c49d8282ec46b85b58afe8f0f2600024875fb9a7bd1145566ca328966)
set(QT_HASH_qt5-datavis3d ced9c6083ade43f43db2a86b20188a75a7028b7f89613a0d94ea48ec795b234af669caa45227cbbc7c2c3187b017fb5521c2d7c16834277d9dba1671afb00076)
set(QT_HASH_qt5-declarative fd16159217f7526f6e56d1849ffb2d219e0bee48581e4a1d3bdec1602f884038f3747da68b8905a6858e6e8e03e18b9da4d598a154d4d0a11a62b818940d3113)
set(QT_HASH_qt5-doc a9acd8ee19f1fe7f2f30865449b37c8c67a1cc7029fdbcc2d267932d1c73f4b0c478a9023fe724aed8269b22b63dce824624e9cbc5fd6b5f08a719a6007ff076)
set(QT_HASH_qt5-gamepad 03f403c0f966c95b0c64286c047c54bc09e49ad7029de8476d792cc240d0d8b78a426f98e6358376cfc2abcaefb2500ff2182414bd8c2244541b065220780f63)
set(QT_HASH_qt5-graphicaleffects ee2f4e24ced70c1531ceb310c90d6c0bb5300f527a247f07599467f355fb89a426cce6bacb25b77b6ec62f4e358d2345093343ad442acd182dcaca77e031a0bf)
set(QT_HASH_qt5-imageformats 48b0dac1acfdae1b090bc5d0054610f61290135363400a629ce3650cddd4c11f7bd95edd5bd1d36d758006a5fd54ded29f540a6e8dc675ca2e85d4ae169add50)
set(QT_HASH_qt5-location 37ccec9d9ce4ab59c0e4a2827c94d2e7247786fa53dc340539160631aaa9e5de02fbff1a5fadc5d96c64b2d9a81a5912a562beb6e4d0ec09186f8508626ade36)
set(QT_HASH_qt5-macextras 62603dee7741845ad4ecdfd8dd81042031851bebe3f13281bc9fb18c56cfd546abeba200f57e1ca0364d8271bd76a8e2180e2403270fec914ee04be7dfb4248d)
set(QT_HASH_qt5-mqtt 09476ce6922a89f513f588a15c4b664f637b2d6fa17545d2a6d8d176b6f32bf41263200f52e9755f5d4d349ac2662ead4efb2a8375a19005947228a6e64c8222)
set(QT_HASH_qt5-multimedia fa70146275d03c1bb8da1930eb66a9bbbf2a6c25cb6e6204a58b8338f58e671634eab878e9bac785ae2394de7dc38d30025a4afe4d26060e2f23a44758b2e5a4)
set(QT_HASH_qt5-networkauth 939ee9759fa0584aab060f420bdd98a44c49d93291dabff74bd90536a4cbd666899d3c1e19b438c1c3333d7d3f374a7a3b0beb8728b69ef19b915d2496f3fba8)
set(QT_HASH_qt5-purchasing 0b6b81e0ba458a7dd51cd373f1c74e63a6577dbf28c0c660d47b43a00c53d4bb6e14592d2a9210d8b843abddf92f8012d188bfd374ec086776c19df82df5308d)
set(QT_HASH_qt5-quickcontrols 9d84b2a0b0c752df7dd735a29b04a2e6351e016bb693ace49d05b51754784f7da3e335e8da1070b2e31391a4dc35a55adb36286bb5ec4e29e608801fcd8d2bcc)
set(QT_HASH_qt5-quickcontrols2 0aae8d2f208a47c38f8604879a55e019b7b34a1f1202fa9b447a30753d540de9cdc3c7a8658c36a5d4c01596d2c8c65ba279d7c67e70c48a6ebdb5ad443ca8b0)
set(QT_HASH_qt5-remoteobjects 5bdcb7560f4b08e81b0646790c145598524e4e75888b96ffad2f19c51896fbbcc56d50ad24ae4072a87b63a494250dc30aca782bd093f4f49e649d670e557117)
set(QT_HASH_qt5-script 38060e3cece2819befa67e078eee6a4bcf9c0135015724af4786eb3190cb1bf6895dc5b8a919da83b6d0576d1aa109ab4050c997409c7f5eed52385ef325e2de)
set(QT_HASH_qt5-scxml ba7c40b08951521e8d56372456c6e613a49cd2bc42d8def7b477e0334100dd741fb20a6ef9d860dba9be44547998eee6bea30de0f16f43b3152e51132bcb2d90)
set(QT_HASH_qt5-sensors d6bd4fe02625272786f8c0f384ecce7497eebc3d691deaf9a42b9b221e4905715c7adb4e56fc04487b39f950b34f2239e8902e6e7880bf793461e808d6c9d245)
set(QT_HASH_qt5-serialbus 12e5580249f0d241b0536be8c4ab5a01eed722c9cbaaa4c052ecacb8e105c0d31f4e83e87fcf7f30711e48b0a6d0ee413bd837ea2bb7fbc41bddb7e6ab18ea22)
set(QT_HASH_qt5-serialport 5eab045b704f101f046880e57ff5f3c0f901867d092892939c0c20e54624f30b676802ec9535f3be39e9687497e28bfb71b560635b0cb38e241a225d377e74ee)
set(QT_HASH_qt5-speech 43b97ddc333d1c4a9715b1c306ced0506eb8faf69f1d22500b74e509d33b5a5cb9d0c166b9211a32a78eaba57925195d8ba0c39c8ae6a15551f841426294c75f)
set(QT_HASH_qt5-svg 17d13fdeec439c02e7b7e478527376da2d4efd65e019fb18822d3d7883cbf129eea2661c19e931e59280c3bda7233fa6cfd84c4d76365abc63814a80e99f2a65)
set(QT_HASH_qt5-tools a73abba58c76a69e2208c4228bf115f2ef6173db8fa00df9302eb4c8f04ff04b64690367c31a680dba3b0b8865ef27343e8d7343f7f81954c39458c443fd3500)
set(QT_HASH_qt5-translations 5404c98ba6303986da0ffc5f715cf7024b724183e6f30b15bc9825cac2d1715239a4479093cb46239cceaa0a7468dd05e190cd0a6911b22f3628ff57ff3d8c57)
set(QT_HASH_qt5-virtualkeyboard abe58c132c8bd23d29de1937e2f1fb6571aec829ce74f4904d322c4046d8c70b4b9b508930e4c681a8e30ff1d8a63c627cc3bec1560e83dada426c09d827ae29)
set(QT_HASH_qt5-wayland 1f5b5e911ad9026d08260e5ce15aad5c9167726ce42db85634392f1e49d545ca5bcd4e44304f1ff633ffe110712a2b5dad87de6cd89eb3b7e6c657fe260e388d)
set(QT_HASH_qt5-webchannel f0c698aded46ae1f2932a79bdf9d5601466b7e88f6af96fe48d346144fd2e5bbaa81c7c6a82ed78fe8a0314218827704648741b0b47c0efefc31eb447643ad23)
set(QT_HASH_qt5-webengine 0c9aa844148e908c2eb5af93b51d2809f183f775d5760b4654f8f34ac825fd8b9d81a9b70cb9d79d16502bdce7bd6d77484c5b04797d99726f6ff5e9e40af03f)
set(QT_HASH_qt5-webglplugin 14de04d356fb1d3475f5630ecd020b1d5c1127e1bd1032a668b6e0bb6073b04225494cf8a45c62c6b02d95f64fa81d4c0598f7e3e6a39787eeb23096da351e5a)
set(QT_HASH_qt5-websockets 578ccdb69602f978b9a10c08045f3a6fd0fe2247c07703617c1a717dc8910b383bff4c1f6a8195643f0552cb707ece5eca4c7e7f4d90356c26a409a849200489)
set(QT_HASH_qt5-webview 886c46dfb2e66ceeeb423220b48e47bdc8968faf5b9553f9e206ddb84d201341c6ad49308740835de3f27960ef04276477df5a55faf9e3c4c68180ae96acbc6a)
set(QT_HASH_qt5-winextras c0c7193f0f4c3011ff44eb98fbb66780d64037e0b8cd46554b57849e1a5e926b666263ab64bd3a1d8ff116b364425b077fae4c4d839c80d89bdf214f78fe8c65)
set(QT_HASH_qt5-x11extras 8fcaab6a1ba13798bb86c236102b2af932e46de25de3bddc11baff5175db65ab0bea123d5c8477fea36fe1075481c335dbf554165c22e43a3409706b5f330695)
set(QT_HASH_qt5-xmlpatterns 01a7e41c0fb8c97b72a503c5a8276f2a9744aac624be79c50d366a5229f91920d0827c36ee9e434c78ded4b1624c8491da08af36ccd9dedd59d0d0785a5bb776)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")

View File

@ -1,332 +0,0 @@
--- 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;
}
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -1732,10 +1732,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;
}
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -779,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)
{
@@ -814,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;
@@ -832,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;
@@ -1038,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));
@@ -1387,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",
@@ -1417,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));
@@ -1596,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;
@@ -1982,14 +1991,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));
@@ -2368,17 +2379,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);
@@ -2452,28 +2461,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);
@@ -2554,15 +2565,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);

View File

@ -47,7 +47,6 @@ endif()
qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
PATCHES
# CVE fixes from https://download.qt.io/official_releases/qt/5.15/
patches/CVE-2023-24607-qtbase-5.15.diff
patches/CVE-2023-32762-qtbase-5.15.diff
patches/CVE-2023-32763-qtbase-5.15.diff
patches/CVE-2023-33285-qtbase-5.15.diff

View File

@ -1,7 +1,6 @@
{
"name": "qt5-base",
"version": "5.15.12",
"port-version": 2,
"version": "5.15.13",
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qt5-charts",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-connectivity",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-datavis3d",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-declarative",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-doc",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 doc Module;",
"license": null,
"supports": "linux",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-gamepad",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-graphicaleffects",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 GraphicalEffects Module.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-imageformats",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-location",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-macextras",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.",
"license": null,
"supports": "osx",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-mqtt",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 MQTT module.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-multimedia",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-networkauth",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Network Authorization Module",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-purchasing",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-quickcontrols",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 QuickControls Module.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-quickcontrols2",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 QuickControls2 Module.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-remoteobjects",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-script",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Script Module.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-scxml",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-sensors",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-serialbus",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Serialbus Module;",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-serialport",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Serial Port - provides access to hardware and virtual serial ports",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-speech",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Speech Module",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-svg",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-tools",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-translations",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 translations module",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-virtualkeyboard",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-wayland",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 wayland Module;",
"license": null,
"supports": "linux",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-webchannel",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.",
"license": null,
"dependencies": [

View File

@ -1,27 +0,0 @@
From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
From: Frederik Seiffert <frederik@algoriddim.com>
Date: Thu, 12 Nov 2020 12:53:43 +0100
Subject: [PATCH] Fix building with ICU 68.
ICU 68 no longer defines the TRUE macro.
Closes #204.
---
encoding.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/3rdparty/chromium/third_party/libxml/src/encoding.c b/src/3rdparty/chromium/third_party/libxml/src/encoding.c
index c34aca44..264f60bb 100644
--- a/src/3rdparty/chromium/third_party/libxml/src/encoding.c
+++ b/src/3rdparty/chromium/third_party/libxml/src/encoding.c
@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
#ifdef LIBXML_ICU_ENABLED
else if (handler->uconv_out != NULL) {
ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
- TRUE);
+ 1);
}
#endif /* LIBXML_ICU_ENABLED */
else {
--
2.39.3

View File

@ -49,8 +49,6 @@ set(PATCHES common.pri.patch
gl.patch
build_1.patch
build_2.patch
workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
0001-Fix-building-with-ICU-68.patch
0001-Support-ICU-74-in-LazyTextBreakIterator.patch
workaround-protobuf-issue.patch
)

View File

@ -1,7 +1,6 @@
{
"name": "qt5-webengine",
"version": "5.15.12",
"port-version": 2,
"version": "5.15.13",
"description": "Qt5 webengine Module;",
"license": null,
"supports": "!static",

View File

@ -1,10 +0,0 @@
--- a/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
+++ b/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
@@ -9,6 +9,7 @@
#include <set>
#include <unordered_map>
#include <vector>
+#include <string>
#include "base/optional.h"
#include "ui/accessibility/ax_export.h"

View File

@ -1,6 +1,6 @@
{
"name": "qt5-webglplugin",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Webglplugin Module",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-websockets",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-webview",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5-winextras",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.",
"license": null,
"supports": "windows",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-x11extras",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 x11extras Module;",
"license": null,
"supports": "!windows",

View File

@ -1,6 +1,6 @@
{
"name": "qt5-xmlpatterns",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation",
"license": null,
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "qt5",
"version": "5.15.12",
"version": "5.15.13",
"description": "Qt5 Application Framework",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -7061,67 +7061,67 @@
"port-version": 0
},
"qt5": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-3d": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-activeqt": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-androidextras": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-base": {
"baseline": "5.15.12",
"port-version": 2
"baseline": "5.15.13",
"port-version": 0
},
"qt5-canvas3d": {
"baseline": "0",
"port-version": 2
},
"qt5-charts": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-connectivity": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-datavis3d": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-declarative": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-doc": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-gamepad": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-graphicaleffects": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-imageformats": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-location": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-macextras": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-modularscripts": {
@ -7129,107 +7129,107 @@
"port-version": 1
},
"qt5-mqtt": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-multimedia": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-networkauth": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-purchasing": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-quickcontrols": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-quickcontrols2": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-remoteobjects": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-script": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-scxml": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-sensors": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-serialbus": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-serialport": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-speech": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-svg": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-tools": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-translations": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-virtualkeyboard": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-wayland": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-webchannel": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-webengine": {
"baseline": "5.15.12",
"port-version": 2
"baseline": "5.15.13",
"port-version": 0
},
"qt5-webglplugin": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-websockets": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-webview": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-winextras": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-x11extras": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5-xmlpatterns": {
"baseline": "5.15.12",
"baseline": "5.15.13",
"port-version": 0
},
"qt5compat": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "920720dacbd54815ea9eba023787665002d80269",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "a0f73e9f36b58bb194c21d495bb0a4e8fc9a4d41",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c82721fd67fa6bd970284211188c2861c4313f6",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "c5105fba54b83485f15754fe858dd8b8318a88eb",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "28b06b7abffcddf201952919aae9397213a4345c",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "bb3e1de9127ad2c1bda4ebf21f441adfa5facf63",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ad1dffea8d188fbaf56e7d2564455b96bbce57bb",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "1ff980ad44dfab95d50dfe163ff3ef2de05d41d7",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "24b198d23e7dcbb9a1916ebcfd5b81bcdbef5875",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "4a21040c82b8746bd1feb8d7830defa42f9cff7a",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bc90db932309d5ebd204c1a30bf0472c2fe3be9e",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "4de0c9f255cb601469ad4e7d42e55f14e27dba11",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3eba515f1c990d7fd69cbd6397059d56ed9e3a18",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "d4af2cbfb2191d9525a25bfcf9b7633cfa62890b",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3bdbddea018d175d898cc81dd37f1a4f8d61175c",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "859e5b2f20ce9e1d782b9a2190b273249f5fb44e",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1877940a1e172665b2287d83216c6ced80476bfe",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "b67cd829b2cdff91e51d2da5651a98d4d02cc6e2",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f50823e53543d711efe3b2a33f8bdbb690d0791d",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "7aa1ca558402bd1cedda0c2c466a51bc1272f8ff",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "886bdb135e50dc31ce6234f0631af2f33be99921",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "27e65ecf7fdd5ff87e1409d76edbfcec7da55415",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "524ec23c474d0de593698dc3f63281eb2cc8bfc5",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "22923758113a31c2d0570b192358fecb3e3a4c2f",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2c1137ae40b2917b10223eaa2600a547bc313a97",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "c27c0c3d8bf68ec89a3b0a7e75192d2b5a6eb970",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2e48fad784046b957d98272b803c255c22208e48",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "480132dc9a67d2dfcbb94be62c8d35f31a901a86",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a8c3a2f3d282ccc596c339d8a5c5fe543215e801",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "380e4063bfa14b26f098b4ae1244c1a09f1ca5f8",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ffe874b0b45c9f257b487b960e17fd21e3fa2ee3",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "f9b0f60b7c990d5f202833234f553ba4424c471d",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b9f58d29ce83acfb07a3a932d5b01d0385dfd07d",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "3ebb64c3ef7457b6050874adc7fa69e1797613c1",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4371bc4cf906924ed77c0e651fd2e9b5a1c96aee",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "ede9ad9a147c9f953d0b1ea54f7a6ed1f3c37cbe",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c1b99bdf7e6457509e5d334d3d5c50d8a15447ac",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "fbb429884146fe7493bf515aa1762c495de51c9b",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c03c44f1db5faa1c16ac3b9a603790c901c0a499",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "8ed4347c3fe7f8e2d57a5aa06b03d5b6a1c37e93",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "621f7d70212c06f6c9af11a509856362f81f8569",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "c46f7b7f674a1ac79a7c8edc63c1e4e16c23c6d6",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2d874a5459cfc43e0b64f4977682df651d36ca2c",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "ac33071fd5ddde84d056539669c67071e85f3691",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86c8999645ca845a082741917d719497e7350475",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "cc9e39cd307b641892aec0e5a2972c781ac68f20",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7c300f7d2ae5260e4e7e858be6863f1dc2f0dfa7",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "b437048a241025e9baaf71a07587958d11e7dfd2",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd325f2c71cd8a32d292c9bd3b7cc5f04f96c5dc",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "4c22dac467d42914d078721e71c047eba6738518",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f15598a75f95ca7a22968fc9336959c919e705f0",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "8339392414afac8b6d179b19ad01db6460d77318",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72dcb5db8787e879e6d1964091806e5401f63e55",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "213220011e61695380694601622b75e4bd781a8f",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f97c1715e4239f661c3c8ddd296f09757efc1cac",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "f47fe4971f6a0d3fc7991fc6dfa76f4dab3ef6c3",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f8920d20da6df3f53f7d1aa625a8c5100eebe2e8",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "350c9197bc751e17c5e0ea532322f1483a6bf1e4",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "43e74504e1043a3ffc451dd97de5b62fecc40ad1",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "87a765320bb699ab1b716b5a4bcc1cc70efc8239",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a196bda4c5a9871354ad65207fe7d0568baeabbb",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "d0a93247e4efaad743aa47711f947efa6a4424ea",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0a52aff690b9816afe0790ba18047f3d2e6b115a",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "44d19f3afd9be463c0cce1fa189dcb08d7ad9c82",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fdc6cc42c7c04faaf48faffbdd865f2761966512",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "c21a5e697bcf761c902064dec1325d34e016e9fc",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ed4c5992bb51331d2a5c27612b74bd3894682220",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "1dbb523d79f59b6fc3f6136650ab1a9973efcfb6",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7e89c0ef3ec287561568f4ffa7a82ed8c50e6c86",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "6a7a0fbea2f47aa24e61928cbe4836164d66a8f9",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "036b9318534e9f37e31ef44a86500cf9807a0a73",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "478c0eea8a9b638f8e79083d16c3ad3ba378f60f",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7263c6930cff830c14124e00b5709b1bb422fe6e",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "359fb6a2340821f4e375568af9f3736c9f8d5989",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c88ea2c4ef0a7d9643831c4f4a62a3aa072f4b85",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "3094cfb44b2edc3284f22378ac0a9d2f847d9d85",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ecd842a58462f72e689d6dfa6f47b4d3d713b9f2",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "467b63b17863b78a47afe3675bf35de910c09871",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3735031c6e2d227ccfb265442feb1f7e9c2c3f0f",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "7d7d728be5f21d29d82251a43f4600bde5b5c404",
"version": "5.15.12",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3d2166fa5cbb5cee46f8726e103c82d7a61ff9dd",
"version": "5.15.13",
"port-version": 0
},
{
"git-tree": "1af37c43da6f3720cf0d805fb13333a42a07fce9",
"version": "5.15.12",