[Qt] Update to 6.6.0 (#34426)

* [Qt] Update to 6.6.0

* fix patch in qtbase

* add tmp port to get qtwebengine logs

* remove dep in tmp port

* Fix CMAKE_BUILD_TYPE being hijacked by qt scripts.

* Fix qtwebengine build?

* add another script to be fixed

* remove path to cmake

* fix qtgrpc

* looks like the variable is defined somewhere.

* avoid aliasing only if the target exists

* try different aliasing fix

* fix patch

* Dep stuff

* reenable atomics

* reenable librt

* remove tmp

* v db

* v db

* add vulkan-header as a dependency

* v db

* also needs libs

* v db

* add a comment to remember me not to touch this again

* v db
This commit is contained in:
Alexander Neumann 2023-10-27 20:18:22 +02:00 committed by GitHub
parent 820cf6afbd
commit 45f34d72b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
105 changed files with 465 additions and 271 deletions

View File

@ -1,6 +1,6 @@
{
"name": "qt",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt",
"homepage": "https://www.qt.io/",
"license": null,
@ -52,6 +52,7 @@
"platform": "linux"
},
"qtdoc",
"qtgrpc",
{
"name": "qtimageformats",
"default-features": false,

View File

@ -1,6 +1,6 @@
{
"name": "qt3d",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version": "6.5.3",
"version": "6.6.0",
"description": "The module contains unsupported Qt 5 APIs",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version": "6.5.3",
"version": "6.6.0",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -29,6 +29,7 @@ qt_cmake_configure(${_opt}
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
--trace-expand
OPTIONS_DEBUG
OPTIONS_RELEASE)

View File

@ -1,6 +1,6 @@
{
"name": "qtapplicationmanager",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,119 +0,0 @@
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index 44cc7fe63e..e44d85a3cb 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -873,36 +873,70 @@ QT_WARNING_POP
return fontEngine;
}
-static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData)
+static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel)
{
QList<quint32> offsets;
- const quint32 headerTag = *reinterpret_cast<const quint32 *>(fontData);
+ if (fileEndSentinel - fontData < 12) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ return offsets;
+ }
+
+ const quint32 headerTag = qFromUnaligned<quint32>(fontData);
if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) {
if (headerTag != MAKE_TAG(0, 1, 0, 0)
&& headerTag != MAKE_TAG('O', 'T', 'T', 'O')
&& headerTag != MAKE_TAG('t', 'r', 'u', 'e')
- && headerTag != MAKE_TAG('t', 'y', 'p', '1'))
+ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) {
return offsets;
+ }
offsets << 0;
return offsets;
}
+
+ const quint32 maximumNumFonts = 0xffff;
const quint32 numFonts = qFromBigEndian<quint32>(fontData + 8);
- for (uint i = 0; i < numFonts; ++i) {
- offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ if (numFonts > maximumNumFonts) {
+ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting.";
+ return offsets;
+ }
+
+ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) {
+ for (quint32 i = 0; i < numFonts; ++i)
+ offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
+
return offsets;
}
-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
+static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
{
- const quint16 numTables = qFromBigEndian<quint16>(data + 4);
- for (uint i = 0; i < numTables; ++i) {
- const quint32 offset = 12 + 16 * i;
- if (*reinterpret_cast<const quint32 *>(data + offset) == tag) {
- *table = fileBegin + qFromBigEndian<quint32>(data + offset + 8);
- *length = qFromBigEndian<quint32>(data + offset + 12);
- return;
+ if (fileEndSentinel - data >= 6) {
+ const quint16 numTables = qFromBigEndian<quint16>(data + 4);
+ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) {
+ for (quint32 i = 0; i < numTables; ++i) {
+ const quint32 offset = 12 + 16 * i;
+ if (qFromUnaligned<quint32>(data + offset) == tag) {
+ const quint32 tableOffset = qFromBigEndian<quint32>(data + offset + 8);
+ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ *table = fileBegin + tableOffset;
+ *length = qFromBigEndian<quint32>(data + offset + 12);
+ if (quintptr(fileEndSentinel - *table) < *length) {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
+ break;
+ }
+ return;
+ }
+ }
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
+ } else {
+ qCWarning(lcQpaFonts) << "Corrupted font data detected";
}
*table = 0;
*length = 0;
@@ -915,8 +949,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
QList<QFontValues> *values)
{
const uchar *data = reinterpret_cast<const uchar *>(fontData.constData());
+ const uchar *dataEndSentinel = data + fontData.size();
- QList<quint32> offsets = getTrueTypeFontOffsets(data);
+ QList<quint32> offsets = getTrueTypeFontOffsets(data, dataEndSentinel);
if (offsets.isEmpty())
return;
@@ -924,7 +959,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
const uchar *font = data + offsets.at(i);
const uchar *table;
quint32 length;
- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
if (!table)
continue;
QFontNames names = qt_getCanonicalFontNames(table, length);
@@ -934,7 +969,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
families->append(std::move(names));
if (values || signatures)
- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
if (values) {
QFontValues fontValues;
--
2.27.0.windows.1

View File

@ -98,6 +98,6 @@ index aef7f15..21b0c1d 100644
-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio)
+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject)
+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio)
qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv)
#### Tests

View File

@ -1,47 +1,47 @@
set(qtbase_HASH "31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9")
set(qttools_HASH "7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b")
set(qtdeclarative_HASH "d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640")
set(qtsvg_HASH "d9391228f4bce041e7c36711cf3d787b373bb2e470b0d21c903d57ee5aeef672289caf8a7e4c57455db105a510d36536c611ceca4f64c823bf795d0638e6a0d4")
set(qt5compat_HASH "49146eb1591e89b1d62a3615d673a4a29db9d2540fac2b2d03eb29ad24ec77ba97f8209240e512252ff1d3083d21312d6142654993582e95a7e549c94e8bf45c")
set(qtshadertools_HASH "fab49d5c7609b9bf81b98562d21e29d05f001a27d446efddec569033eaa322ab336057076a5f2713ea1941f4e716694a471b5ae81be0913bc19668136d7a9b68")
set(qtquicktimeline_HASH "b177eecd5750dcc1ab29bfc4dd1aeb22a6b7e07dcb11683721abf18476da4ff740c9ea4c351aa5bf31e5c499b4c7da5be71b243cdd895a8f35df8178bb50bc93")
set(qtquick3d_HASH "85611eba47239c342159e704826cdcb7ec2cd79118aaad081d4924c5697b71eddf4307682e9dde23bf973641df2e90301e26f381aa29c023e386918e8d1f7f70")
set(qttranslations_HASH "d14d5c40fe93ba1ee29fe4150710a14122dafe91e5343d5461c7ed3157e3e220effd235cf894f75ec6c26a0e5ac81d75867faff4045456395d76221e70113004")
set(qtwayland_HASH "e516dd5158ed1aadc989b3f1bbaad87fa38b59872b44c7c92ec1c349e7e923a6b07b7fb3a3493312330eaf581b0d27aeaad2ec03629523ee28e3627b7c30ea89")
set(qtdoc_HASH "c8cb3a4f155bf697e9168d575f225ca3ab60d289c62c47db72997d01c81129e4c550f673edb60df02dededfa48028c43d5ee6723577db00e78fec188e1f32f22")
set(qtcoap_HASH "385b60c5fb24087bb87cf468303456338897f15cc32570290603312e491943ab00f4d1f013952f6b883d3deabcc870906628101b1ecbc390371544b676c423af")
set(qtopcua_HASH "e814a3acb00f2b0f17d92c8a5722aa47d3a5ee9863db294416eb0d42201ae7dab9c7bfa9a2c81531fb48f103b862bbee3f7000a889364241061543365986fd7a")
set(qtimageformats_HASH "66b8e7385a1b0db77f81730bd97f7e3488eec32a24829c3b21746e89e6ff179a3feacc4d023f1e4e6864a6a7aba46aeb7f66dca7e76836881829a20bb9afbad7")
set(qtmqtt_HASH "1d660864485540afdafde2b87ae6a27a39066201aedb61cde3d15af71f3325893d0a99ac9ac753182569b0fda21ba25d38478c46921e448050abec255f50a59c")
set(qtnetworkauth_HASH "73f04a144cb08048532aa6638dcaae01e9cee07afce10e5371bfa96ac0aac4fe941d84b888eaa4599304bcae58172665319d3eda43c460ab7df9f1b0e5e37f09")
set(qt3d_HASH "15fa46766ff8c8295bb2273dc528f1952a04d20c786ff62122594395a8f003a7bd07944928da472ec2463bed0e31d63af559391724f935bab70067f9009f1917")
set(qtactiveqt_HASH "3bfc52d8484e869a9ab1b489f7616f76ba48b9ac951d34a5a2b299d4c96dc9e3519c885dd86393578d1bbfdf39b59e6b1cba37a1ecb634bf66cf49264d59b621")
set(qtdatavis3d_HASH "4272007a13651d9bb38d8bee58a66ffe448a7e51be530f6d543e8bc688fd30143f426c5f5210ab6f5a8b1d3981b3570ca2ec13ecd4d0e27d039e1f094c6c1f20")
set(qtdeviceutilities_HASH "89a8198898fe928abe528d1967226daefacdde3c2ff59ce58ea3add38396a26ac75468a193ee42a089dbbde5457024aaecb8be3eb94f074c3aa0189d6c17c2c1")
set(qtlottie_HASH "a0e9cda4363ef72a74e4721472aed8266ac9810273ee6fbfdaf9ed5d82495de5e0471a4e521b33f784097694a3f7d42f0ce5a7d39d23781e2e270932230512e4")
set(qtscxml_HASH "f4aeb2f07a203ef448124b3e988735b46ef38d7800cd60ba3db9c0e0b8a9e9aca44bc07a6d72de2951134200c29d902709a80b52fd030713159c8f1711b60731")
set(qtvirtualkeyboard_HASH "f09d8f4c025a94768582d21598a6cc35647511439fa4136933d724954ddb1cab50335df5609a6e951593175faf03cfb233a8805c1bac90d7fda92cfe3f42b3f6")
set(qtcharts_HASH "ce37650c0e1bacc5432a6549fe6cfa8db19b1164c05172802638b51858e9cfcf68a56b401a84ab8d576fe2e1bf4fb08fc1f9c96cecd7f8251b8562defb647b68")
set(qtconnectivity_HASH "d0a8309143545689c7f6f545ae1aa8e1b4e516398bc6cc0d0f0ea3df6a414d6c933d32ae32451134d2a0d7d2c02078e8e46438b0aec59e938e4b8533d4da9457")
set(qtpositioning_HASH "af3ee341b57029ff10270602a23bde0b922b1f43e0e152b0f091e4447099d34df0410df582261935f6397c121f48bf944cc057772de9c063e679755fae7c5d11")
set(qtlocation_HASH "6633dedba335b8de4c96f98f4709a147e225e82fee1ed741938e15e1540421ad7c3140baec75914f0844a793433abcadaf3ce72d944662b62778327d65ff7348")
set(qtmultimedia_HASH "6b32e79f1fac21dba6a1ca9f82cfde8acdf9b33d1a65439d4a972f98ea23c919ecbd26ee4c08ecdb7d2743cab346437f27a701e45426e47fa89e55d913fe50bf")
set(qtremoteobjects_HASH "17cfc030c4d45b395ba20ff0cdc973d55ae75ba34ed200bd01c3fffb7650000c69b95f935bffb43930a3779c5f15cce09ecd716e2b1284f1e28768ce71dee969")
set(qtsensors_HASH "beb2c13855c42486dcbdb2e4885bbe931ded284dee755ecab539149113e2e8fec0b1c20859c36d9fc59b8188dffcfb8b1f4fc9495e04a33c80d425a0322f7f10")
set(qtserialbus_HASH "9806ad33b24f1798081bd88c2dcd821b62f7455826043586f37ad5b6f833eb8f82b2a5d3a5ac21df5e660b0097c58eaabad503f4c19f30acb511785335a7b147")
set(qtserialport_HASH "2a36851281dbe13317f559567dd3cd8f2c8cc73aad9df22de71883790bf7b1f685bd65dc353cff65b212398b6a72d1c517c2cf15e0b41b93be1d0ed7646d7a76")
set(qtwebchannel_HASH "cf9cf75b3df885676bbaa521b991dd176fba826a1cca8e3a524ea553df709ed5f4ccbdd8af19d952957b87bce2de4144c1f2222ab8fd4dbac04d240675b26e71")
set(qtwebengine_HASH "8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49")
set(qtwebsockets_HASH "0121865827101a73aa2957efa322fcd81bf80d9d9e92c2022fa5bdf94c782fb9997392e6da7523e65b51cfd38c255ee7eb87e2de0069016fc93c1383bd116345")
set(qtwebview_HASH "bedc21846e1dacbd8493dfae9d779e3aba5530b99e7d5ee4fd48e299a498b0cb135a8ad7ccebb95de52fd7608d7b5aa23fecec50a13c09f7308750a26f89bc3e")
set(qtinterfaceframework_REF 2bd16fa1d13f98bec2c4e559e1a0372d2948d832)
set(qtapplicationmanager_HASH "b50e7533208706013d32a06030a520e467a6f3968195810ba5c3277ef2da7c86f8c5321905700aa5cd7cc6412fd4f1c7634ad9ab8f7e81ec1a634d395493e7d9")
set(qtlanguageserver_HASH "7f67e645c176fb2addd7409a8e625d34cf06b1e798f26d1edaa3829a2c2491328b7736c78ec9388d4fc75fcc18718a064ad169e4a3981cd7b344f2337b1f28f5")
set(qthttpserver_HASH "49b8f732d57358c64ca07e7dad4a84c6205a3066939596493ad0bde333b339db84c0d73573a04319bb4954d0f48bdad22447bb50ff48ad2d72f982f1f4340be9")
set(qtquick3dphysics_HASH "dc2b19df44a182bf77d0e45250cb4a4485a2143bca8ca043965beb02678bf944fd1c0c34f7411048d69f25fbc496b190ae3d81010e43a7d4a7ee00c4e5cc622c")
set(qtspeech_HASH "d37c68cb9599e8d9a81ac070a87ed5a942e15e01401b5e179b4127aa0894a272023d717f0fc5f5c167e2ff299f79d6a19f3594172cf9779b400ac218d9587508")
set(qtgrpc_HASH "464bc51a597cbfcf1a4461a62453a7ce7bfa0e5744f88fd6a58904d2bc8bccef15fa7082407dcb51d322b9bb963d1d0238e2472e1b67629cc2d67e9c9543b200")
set(qtquickeffectmaker_HASH "514d60b52937e49737afbec018919bf86793600f423076996bfb5def9d75031590816fa17bd04fa48d884c7dc73e25b41e1bfa5348e43bb30711374c29d64bda")
set(qtbase_HASH "4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17")
set(qttools_HASH "42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652")
set(qtdeclarative_HASH "6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a")
set(qtsvg_HASH "3c62b0b1425815fbbeb1d46cc3599edbf5c3b07f1f28840801d34620c0fe81740ad4b70743b72e8a52bdabcb14d77378f1c3fabae4eae2d29e017c8f40923205")
set(qt5compat_HASH "d6eb6ab52281e8b78de2a28aeaa1c0f9107634b5ada9700a4bad4f6fa66e2983dad6566b99d030d0980dd9817395fa033ebee7b79960fa527882b9239e908ff7")
set(qtshadertools_HASH "2b34f596c04eb7d24c83bd09c5a1a10923c0a0e7e94af5443b58c5b41285067da46ff06686877431fa7d385e07e019a1617f15a0bb6a423849d7288bafb41c2e")
set(qtquicktimeline_HASH "a2f8c1d7075fdaf57d7d4fc5f087449ef1a78ea6b6ab4ae7801decdb2436b7f95aefadaf365ab7c2ad0ceaf1f066c3c0ea189f3e3a18d41b89e391e6e5f33940")
set(qtquick3d_HASH "309800ad6afc1959d83d7dba97af41954b813486740f99747df6d997a3420c3a9fcc97e52ae67a390b34885ca9bc683cdecea55dd2ab4b530e7594654fa13454")
set(qttranslations_HASH "99dfd8a2e13f7862a21f9bccde4aa719bca1136addcc3e144fed0632a7d2341b27a44432c36d96ea221e6b5a9b6135241c1f2deeec5be3cbd40e5257ce3f8b77")
set(qtwayland_HASH "e9cf63ccc71d4dc61b04a0f8a1a466e9ede09aa689c53c1ccc9db5233e324894bfd198c9204d8d93509c770a7a6612c8eb9981e0b3ee7428f8bf2dcbdc255109")
set(qtdoc_HASH "15593b8bc37c7e8f5082e0c201e6a99a7646feed52b44dffb46d41d555e7cb060185229c3e271631ec3730947df25af0294561304a8352022e5f5688167ee78d")
set(qtcoap_HASH "27f3f48d3e8e32672194ce2377dc02974d01d5714071104359bb8003999a9b9184170da0ee618449493724036305a9ed47cfdf12fd4a63dfd48671114b05d11b")
set(qtopcua_HASH "d019c8dfc077a725704923234a9ef86d9ce68fdfb1187d18ff3bd9c6a5cc53ac502a67bbf27b70fc20807e99e9eb7d5da094a19bd8cedc1a2e51cc679a7e478f")
set(qtimageformats_HASH "e68d945abfd6f099abeb29d97beff90dd4856c9ad05491e440536edfbf299d1aba32eefc519a87d7e61f9ffcb4cd142ecb4e9d3c2aa10f93b5033de99e8ad0d1")
set(qtmqtt_HASH "22727b04340adffdb0f260cce46b57181c721aab29a1676c42ee64ef4df330556804286357143f858853e10e94230158d7d245d374925c4bab1ab385a4698252")
set(qtnetworkauth_HASH "5954da0478459f217979f6feba067ab4c42333995a203c3245289fcd9b966d18d0824099ff673d9e8a954562ff26595076be727f13194b3318060b7dbcab6ce9")
set(qt3d_HASH "7339fc08173793949f28b117c610e42bd25094d186b93db0a244c429e5232d9f5918247c654ee6c6f66802943eeadd1a545261a98b83db71e20b7867f27d94a7")
set(qtactiveqt_HASH "8f5271ee72499a2965f040ba4f2f7604f23d3c37b828612d7482b6b799b12875da5b916899e80b572a0d7217ce4349389e1e72701438fb9855bc7dbbf1ef6dbd")
set(qtdatavis3d_HASH "fc65c9a0685973bc39d2d54a40d537d9be99c442922c8f60db2c02d7c5ed2e33e4aeaa4c4c76267c6660aa66b6bdd3544d1c371925de74657512a5961b558965")
set(qtdeviceutilities_HASH "26659891a2bb4773ccd9cff8cf8a4e69d3b3649842a1dadb5efb62bb5e7411fb0c9d6d41321d1c850668942999ec55fdc5b54b8fde82fd0571a30d90653bacbb")
set(qtlottie_HASH "d565095945ea18d8524c993f428bc279e755ee5860e4888e7bbd553187aaed0b979fe864f518a439fcdbc663a9176168eebf338d76656876c945e8a21e3ba5f2")
set(qtscxml_HASH "ccb4c04048d4c18625b890b6a84a4ccf12108df88c0af0dff2dfa64b504116802fd6061226f991a212016210ab468f520d44bf4299d3ae79e7fe873e4d10c120")
set(qtvirtualkeyboard_HASH "5bf8c8b892c5398bf78662be3f44fbeb2f7dc96bf4ee88739f778c6427e5c8fd9f3e80356b9bd0ebea8f8adb733de44de51e8aaa6009b7cc52f0d0b5bfd3658b")
set(qtcharts_HASH "87659269eebeb36558337f1e7a954d93f9a0d4b7783611fa47a562c1f7e60b4f228e58650f69aacc72c656f322d3a5763a662206228667aeb32b16242b912bd2")
set(qtconnectivity_HASH "f660edbfaa9aefebdb602bb44b2e62b8a5d8dceba4b8c3d73d0f9daf6c29ff5f8953c134dc5af79dfd90b888f97d99e44f91a8e0aee3a51b278747eee2d1c381")
set(qtpositioning_HASH "6e71563444b1d3102ba6ad4ad04541b7ea3f7ee8737ebab76f7c8f7df5ac8e57afa0612bf634b97da5b7a424f7b2dcf28d57f5e67b91266a5138cbd41de8a0f3")
set(qtlocation_HASH "e4e492229d961bc34630aaff030b46385708312de174c9c47f85a6010f1fcb74e198333920fd5c02153a8bbae770c83d8cd1777177d9c9d7a1d555b6619be8f2")
set(qtmultimedia_HASH "ccfdd1aaed76dfb06692e212405d9b2804aa3da924c903febf5ee3fde057f4543f76284a543c808f600d61b5eadfbfe2437932f5ff4a7d19941c9ab3eae2d8a0")
set(qtremoteobjects_HASH "ef1307247e8355bdc8fd38255d8d75d821bbcdd4098e11e04ff1d63dc11656c7a52a99d4398fd437efc6df782130a2d10820c697385bc8901bb2e182340e91d3")
set(qtsensors_HASH "d7aa9a9c06c3c2c090a7ea570a9f01914ff62775ae9b6c4e4f6296e0f891d5b45fd0bedd04cebf02e314f73e8ccb8997bffe05ef04c19421f66638a4781a4b7d")
set(qtserialbus_HASH "90ec1ebba16247781e294d482257314f681f668d0abea84862d4f64bc09bafdaea5081098a5df716f22c1d0098862aa3ea3d4eba167470e0c35c4181dbe8366b")
set(qtserialport_HASH "8fc91ed80a7a58b2126f746a1148f64d34812574180d9b8609629e93903ce6d026f279aac87e0acd90f995d57ba12290fe57294ca15482c035337566ffe51fc6")
set(qtwebchannel_HASH "bffa1aeaefc1b3b5e8d0f958a689b9debd37134ed705f029c2edbd0c483181a474648c251e4921fc8a3d32ce6c1632e82ddba51c55cfb49843cf022870f053f7")
set(qtwebengine_HASH "30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366")
set(qtwebsockets_HASH "c679be915ed3831778d527d29a8a7277cdfe3912dbfd3d813750006c41c9433786122306db658bb5c1c22e22da9cdc339794b53c4f6c36d4603e98ddff60f0ef")
set(qtwebview_HASH "f76a64a36388e8fc7376d045dde6a54cfefb13c2b72378d9f7d35cc7c91c8a02ed8973918b335e67fc326967ae64a07fe685c521f5e0b30494d5e0a931b27b74")
set(qtinterfaceframework_REF 27cb74bdf3e24400687881fbf873c404bff49f37)
set(qtapplicationmanager_HASH "5c0f8f9b73bc3531727af9cb0175c1cc6487f81cfdc8574b53e5ce88375d767cd8b4d912a39545eab0219465ff633d913fb769fc44fc9715702f90e168117d81")
set(qtlanguageserver_HASH "58bc24427f7f33772bebfd5a67c091315b4c913a3c8d6c48a151046543e2756c4c2b0fa03e64bc6b1c760b28849b19676e86b24c4242353fd0aff5b8fa6015d5")
set(qthttpserver_HASH "06e501042d4fb78f4ade4093fc05940373156cc2fedc11f0a3b2191cc975fd92e660921c0c88ebc124cf243457f0dfedf7a1f32d30cd24e7fc74397191edd79d")
set(qtquick3dphysics_HASH "aba0669499ccc4989d50d3bd00b591317a8f09d234767f6ae10c360989a002a7426dc867c19843701e7a7f14b526c18be50274d5a30638e74a80e4257c6490f8")
set(qtspeech_HASH "29fc5e2401ac0d184ca5931c86eba152d33433ef60e91e3c30fdce79438e13f89b9f7ea01452c528fabd24425a9396c6d6f18b8d7d085a002073f0d27ec2a56a")
set(qtgrpc_HASH "e839d7a79349c33460850384933317af61c77abe90682566d8d457470619ca0571190befa91f71c8ba358f5320c11ac0090dffd29b99145134702fa571bb2432")
set(qtquickeffectmaker_HASH "7f89c05cc421a90c0006f3411a9965f27ada45de149a0ce0ca0f9d3b6d0a05ab5409e3cc66aa7cf8563b4d0796c77eb17976c56c03d65bc0724f0451eb0b810b")
# Keep for beta/rc
#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e)

View File

@ -7,7 +7,7 @@
## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
## 7. Set QT_UPDATE_VERSION back to 0
set(QT_VERSION 6.5.3)
set(QT_VERSION 6.6.0)
set(QT_DEV_BRANCH 0)
set(QT_UPDATE_VERSION 0)

View File

@ -0,0 +1,17 @@
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
index 180ec33..a03e3b1 100644
--- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake
@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target)
set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}")
get_target_property(type "${target}" TYPE)
- if (type STREQUAL EXECUTABLE)
+ if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}")
add_executable("${versionless_alias}" ALIAS "${target}")
add_executable("${versionfull_alias}" ALIAS "${target}")
- else()
+ elseif(NOT type STREQUAL EXECUTABLE)
add_library("${versionless_alias}" ALIAS "${target}")
add_library("${versionfull_alias}" ALIAS "${target}")
endif()

View File

@ -0,0 +1,24 @@
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index 21c40f2..c212148 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -162,6 +162,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value)
# STREQUAL check needs to be expanded variables because an undefined var is not equal to an
# empty defined var.
if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
+ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
AND NOT __qt_toolchain_cmake_build_type_before_project_call
AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
AND NOT __qt_internal_extras_is_multi_config)
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index 762299f..f104479 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -56,6 +56,7 @@ get_property(QT_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CON
# See also qt_internal_force_set_cmake_build_type_conditionally which is used
# to set the build type when building other repos or tests.
if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
+ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
AND NOT __qt_auto_detect_cmake_build_type_before_project_call
AND NOT __qt_build_internals_cmake_build_type
AND NOT CMAKE_CONFIGURATION_TYPES)

View File

@ -12,6 +12,7 @@ set(${PORT}_PATCHES
allow_outside_prefix.patch
config_install.patch
fix_cmake_build.patch
fix_cmake_build_type.patch
harfbuzz.patch
fix_egl.patch
fix_egl_2.patch
@ -19,7 +20,7 @@ set(${PORT}_PATCHES
GLIB2-static.patch # alternative is to force pkg-config
clang-cl_source_location.patch
clang-cl_QGADGET_fix.diff
CVE-2023-43114-6.5.patch
fix-host-aliasing.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@ -118,6 +119,11 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON)
#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms
#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
# Network features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS
@ -139,6 +145,7 @@ endif()
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON)
# Gui features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
@ -157,7 +164,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
"xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled.
"xrender" FEATURE_xcb_native_painting # experimental
"gles2" FEATURE_opengles2
#"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
#Cannot be required since Qt will look in CONFIG mode first but is controlled via CMAKE_DISABLE_FIND_PACKAGE_Vulkan below
#"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_WrapVulkanHeaders
"egl" FEATURE_egl
#"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
#"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz
@ -240,7 +248,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS
"sql-oci" CMAKE_DISABLE_FIND_PACKAGE_Oracle
)
set(DB_LIST DB2 Interbase)
set(DB_LIST DB2 Interbase Mimer)
foreach(_db IN LISTS DB_LIST)
list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON)
endforeach()
@ -318,15 +326,16 @@ file(COPY
file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n")
set(other_files qt-cmake
qt-cmake-private
qt-cmake-standalone-test
qt-configure-module
qt-internal-configure-tests
qt-cmake-private
qt-cmake-standalone-test
qt-configure-module
qt-internal-configure-tests
qt-cmake-create
)
if(CMAKE_HOST_WIN32)
set(script_suffix .bat)
set(script_suffix ".bat")
else()
set(script_suffix)
set(script_suffix "")
endif()
list(TRANSFORM other_files APPEND "${script_suffix}")
@ -364,6 +373,7 @@ foreach(_config debug release)
string(REPLACE "../share/" "../../../share/" _contents "${_contents}")
endif()
string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}")
string(REGEX REPLACE "original_cmake_path=[^\n]+\n" "original_cmake_path=does-not-exist\n" _contents "${_contents}")
file(WRITE "${target_file}" "${_contents}")
endif()
endforeach()

View File

@ -1,7 +1,6 @@
{
"name": "qtbase",
"version": "6.5.3",
"port-version": 1,
"version": "6.6.0",
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,
@ -391,7 +390,10 @@
"description": "Thread support; provides QThread and related classes."
},
"vulkan": {
"description": "Enable Vulkan support"
"description": "Enable Vulkan support",
"dependencies": [
"vulkan"
]
},
"widgets": {
"description": "Qt Widgets",

View File

@ -1,6 +1,6 @@
{
"name": "qtcharts",
"version": "6.5.3",
"version": "6.6.0",
"description": "QtCharts module",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtcoap",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt CoAP client module",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -5,6 +5,8 @@ set(${PORT}_PATCHES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

View File

@ -1,6 +1,6 @@
{
"name": "qtconnectivity",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Connectivity",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt 3D data visualization framework",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -25,6 +25,7 @@ vcpkg_buildpath_length_warning(44)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

View File

@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtdeviceutilities",
"version": "6.5.3",
"version": "6.6.0",
"description": "Utils for Boot2Qt",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtdoc",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Documentation",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,7 +1,7 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
set(${PORT}_PATCHES protoc-host.patch)
set(TOOL_NAMES qtprotobufgen qtgrpcgen)
# native_grpc ->grpc WrapgRPC
# grp -> qt[network]
@ -10,6 +10,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
#--trace-expand
CONFIGURE_OPTIONS_MAYBE_UNUSED
QT_BUILD_EXAMPLES
QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS

View File

@ -0,0 +1,23 @@
diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake
index 82972c8f18..08335fa746 100644
--- a/cmake/FindWrapProtoc.cmake
+++ b/cmake/FindWrapProtoc.cmake
@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND __WrapProtoc_find_package_args QUIET)
endif()
-if(NOT CMAKE_CROSSCOMPILING)
+if(0)
if(NOT TARGET Threads::Threads)
find_package(Threads ${__WrapProtoc_find_package_args})
endif()
@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING)
endif()
endif()
-if(NOT __WrapProtoc_protoc_imported_location)
+if(1)
if(CMAKE_CROSSCOMPILING)
set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}")
endif()
find_program(__WrapProtoc_protoc_imported_location

View File

@ -1,6 +1,6 @@
{
"name": "qtgrpc",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt framework based gRPC clients and services.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qthttpserver",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Extension: Qt HTTP Server",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtimageformats",
"version": "6.5.3",
"version": "6.6.0",
"description": "Additional Image Format plugins for Qt",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtinterfaceframework",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Interface Framework",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtlanguageserver",
"version": "6.5.3",
"version": "6.6.0",
"description": "An implementation of the Language Server Protocol",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtlocation",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Location",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtlottie",
"version": "6.5.3",
"version": "6.6.0",
"description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtmqtt",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtmultimedia",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Network Authenticators; QtOAuth in particular",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtpositioning",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Positioning",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtquick3d",
"version": "6.5.3",
"version": "6.6.0",
"description": "A new module and API for defining 3D content in Qt Quick.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtquick3dphysics",
"version": "6.5.3",
"version": "6.6.0",
"description": "Physics engine integration for Qt Quick 3D",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtquickeffectmaker",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtquicktimeline",
"version": "6.5.3",
"version": "6.6.0",
"description": "Module for keyframe-based timeline construction.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtremoteobjects",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt distributed object system",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtscxml",
"version": "6.5.3",
"version": "6.6.0",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtsensors",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Sensors",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtserialbus",
"version": "6.5.3",
"version": "6.6.0",
"description": "Support for CAN and potentially other serial buses.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtserialport",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Serial Port support",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtshadertools",
"version": "6.5.3",
"version": "6.6.0",
"description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtspeech",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Speech support",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtsvg",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt SVG",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qttools",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qttranslations",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Translations",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -14,7 +14,13 @@ endif()
# list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write)
# and add t9write as a dependency.
#
list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no)
list(APPEND FEATURE_OPTIONS
-DINPUT_vkb_handwriting=no
-DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrAlphabetic:BOOL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrCjk:BOOL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CerenceXt9:BOOL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_MyScript:BOOL=ON
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}

View File

@ -1,6 +1,6 @@
{
"name": "qtvirtualkeyboard",
"version": "6.5.3",
"version": "6.6.0",
"description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtwayland",
"version": "6.5.3",
"version": "6.6.0",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtwebchannel",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt WebChannel",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -62,8 +62,7 @@ vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
vcpkg_find_acquire_program(PYTHON3)
x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib)
x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES html5lib OUT_PYTHON_VAR PYTHON3)
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
@ -105,6 +104,7 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes.
-DBISON_EXECUTABLE=${BISON}
-DFLEX_EXECUTABLE=${FLEX}
-DNodejs_EXECUTABLE=${NODEJS}
-DPython3_EXECUTABLE=${PYTHON3}
-DQT_FEATURE_webengine_jumbo_build=0
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})

View File

@ -1,7 +1,7 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt WebEngine",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtwebsockets",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt WebSockets",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -1,6 +1,6 @@
{
"name": "qtwebview",
"version": "6.5.3",
"version": "6.6.0",
"description": "Qt Web View",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -6793,7 +6793,7 @@
"port-version": 2
},
"qt": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qt-advanced-docking-system": {
@ -6801,7 +6801,7 @@
"port-version": 1
},
"qt3d": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qt5": {
@ -6977,63 +6977,63 @@
"port-version": 0
},
"qt5compat": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtactiveqt": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtapplicationmanager": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtbase": {
"baseline": "6.5.3",
"port-version": 1
"baseline": "6.6.0",
"port-version": 0
},
"qtcharts": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtcoap": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtconnectivity": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtdatavis3d": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtdeclarative": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtdeviceutilities": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtdoc": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtgrpc": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qthttpserver": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtimageformats": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtinterfaceframework": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtkeychain": {
@ -7045,43 +7045,43 @@
"port-version": 0
},
"qtlanguageserver": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtlocation": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtlottie": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtmqtt": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtmultimedia": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtnetworkauth": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtopcua": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtpositioning": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtquick3d": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtquick3dphysics": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtquickcontrols2": {
@ -7089,75 +7089,75 @@
"port-version": 0
},
"qtquickeffectmaker": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtquicktimeline": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtremoteobjects": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtscxml": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtsensors": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtserialbus": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtserialport": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtshadertools": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtspeech": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtsvg": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qttools": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qttranslations": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtvirtualkeyboard": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtwayland": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtwebchannel": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtwebengine": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtwebsockets": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"qtwebview": {
"baseline": "6.5.3",
"baseline": "6.6.0",
"port-version": 0
},
"quadtree": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "766ab007c0d703f29b892b6496af3ae458aab9c0",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "9f70e09569f7a3dc11f7efe9acb2fe646e0354c9",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d3c2532ea0b16b01aeb17c7e1bcdb0e4c1d3ff0a",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "02baf17bff3c96ec6e5e2f79576528b095b6f6b8",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e1188f496b30f0e4a2ed309dca03300c2f02c983",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "796db01f88dcd7b21cc357eba90ed6b1ce6c1669",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b4e05b3e0a3ce481228324c480ac8106295a6cec",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "fb16d16a9320a29c3186de89a48d7407bcf00766",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1baea015b866f295c1724220bf214796a8013d8a",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "df9800b840b0972676b0d95ef8b7e86986e5a24b",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb1e1a00df34c350c817ee3d9ab90d2c52ced194",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "348dbf9cdcda0559adb72c98c249e06f8a2e50e8",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "da08464343df644146582857a4f560da79b76f06",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "84c40bfb820f201f6e431fff8298e82acd0e7951",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d18fea1869e4a37cde80de8e31294da8aa38fe1",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "3c16003284dc1a246e17025e2831ec61e26ebde7",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b130a6686447df20bc5ae96bd6153cbac5aa1977",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "09ef297e42457aa0c3bded1d834760d3fefb402a",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "256b706e812d3da7b4eb279e79b04095dcadde98",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "18cd1d93b0a6560a076444c03d76e5339d17abee",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a1b753b4c94c95edf6c8ab7bac9c4577f060b9a4",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "8d65969f28fb847dbfcd93ae76a2bc3019c6ab81",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "49d4c0efba0c96742ba85c1699c5c0a39ac0937d",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "766f2aba652da721ddec6c476ecd2f1481ad030b",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ed7bf70cb4a5e21fb76e7f7cc89d234fffd3201e",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "de18f463e0a97321b9eb039e9ddb1674600b993f",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "65fd752fc052bc1cbf13d66417e9c6c1aedc238a",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a7dc614f31a77ea86fc407ecdd994ae597ac9e94",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "06ae6f390b9ea2025c189ecdadbeddde662b4f6e",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a1bef888af2bc8f653336ee8c817e1e3ea9b514a",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bf58f188746291ad38bafa413affa145fe792ee7",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "102ca43cd0aa09e7c5ad522d983179e77bdb563e",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aef598c3223519da2bbb08353d365661f8959856",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a9ea8f81cfcb1c6b58edb0ac0fc9301bb28500b8",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c8ae2fe1a207df127db279e437784cf63a1a2b7d",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "83bd9154b17ba720fb96ffa099ab841809f676ec",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f58c7ebb91f69f42a31504da406ece6d5d120593",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a84cfd1e4542f3a6f61d7b9f21090bc15c2e3ee5",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c6ada64395147597928ad9d5af7e4fd5e7b4f0e",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "3ac387660fd91aebf9fdbeb678d45fb7fc7fb68f",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7cb4cc198bfe6cec44ec059a9f2f516032edee04",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "400ebbcd072b0b19822683e9060078196e7fafc6",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d9c5671dd094e509c890955ee1f267b160bffa2c",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "620531e56bfde6f0c2f158222e6d3fe174e94e7d",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ca177a05c921704e599d85961e52d6ee25d6b862",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "843c419d80c9d87f46e8b9233ce9d4b8813ec173",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8ce50eb99dc427d5b17a01f839f70a3cc2d0cfea",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "87ddfbf3e66eebc33fb874c57a8a98644546f9c4",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "80617e2f8e7186192365523150d3169d9b5a9061",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "59b3203201b5711114749a093647e1deb8f433d3",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c54c8417690bd1ebe375cd71a48388c6bf1d5782",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "b91395b12a8c64d6622a18a54c1f92203c70d591",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bcb4cf2b1a80ff497ce7fafc885882aac775a6de",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "0cfacf9011d6a0ac51afade0fb3f560d8738c877",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4325f77bda6cdda94f1dea48423dbbff111c97ae",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a35495b91cd073de54bb5429d96c5e2f13bcef76",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c089d10397f5bb8155b9e96fbbc1f7c1392b53f",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "45b571612589ee8327ee557fb23ebe6196de724a",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ad083b7bdf871b65fa3f68cda2823f51e8cfe797",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "0326668fb829b020e66b53d8595e29fc2ac9d10d",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "25674eaa881bd361a4a333903f72a16656ee8ce6",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "38f9e0bb70c3b510e0496dd9678ae8051b7086ef",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "12ee32f418c15549486f21fd1fda55c629b01124",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a68065c7c255aa4e07c10f140cf539ddf9481ca9",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d32539a07f99298f75e4006ff7c966a7d9e9f3ef",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "894d8e4754494932a42bc1e5be1fe3094af6e299",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a3224730e30748c1b7c57f6210cd375cd2a45f81",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "74930da655fbc25f2ca02eb8e069732f566dc1d9",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f84dd4728eb9792df16ff1b956ffdb806b04c016",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "0c3ce884f17ccc857975e2d0247c13d7f07e733c",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "328df565e4640e536a8f6dde383feed0105fffc8",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "a6bb68e8f537cc9f201e30c56122b615fac0da48",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d1fcfd06b00e6e9f71dbe6e83bb796e89d774228",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "5c69ed714c8ae47743eb654424d1bdac65b1ac07",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fabca872bf0e61547c64af674e33d557915d70c7",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "5481b3959bc7fbfc044326799d1c32f8ac42fc87",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "74986f47f213bebd33f07dbcc8a01c68719ac223",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "32afed31d843b9020943e27ce3ee3357d9f78ae5",
"version": "6.5.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1c8dffb036b8e24cbfab8dc4fa4c49cdd02b4221",
"version": "6.6.0",
"port-version": 0
},
{
"git-tree": "5be43c5f5cfe34aafe055afb69d844eedfcaf9e6",
"version": "6.5.3",

Some files were not shown because too many files have changed in this diff Show More