Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[Qt6] Update qt 6.2.1 (#21037) 

* [Qt] Update to 6.2.1

* add changes from qtbase in the vcpkg-qmake PR into this PR. (So I don't invalidate everybody in the other PR)

* [skip actions] fix qtbase and format of vcpkg.json

* remove outdated patch

* remove patches and add alsa feature.

* version stuff
This commit is contained in:
Alexander Neumann 2021-11-04 23:29:53 +01:00 committed by GitHub
parent 0efe643403
commit 063d5fd9de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
80 changed files with 311 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qt5compat/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "The module contains unsupported Qt 5 APIs",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtactiveqt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"supports": "windows",

20
ports/qtbase/cmake/qt_install_submodule.cmake
View File

@ -119,12 +119,32 @@ function(qt_cmake_configure)
set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
endfunction()
function(qt_fix_prl_files)
file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}/lib" package_dir)
file(TO_CMAKE_PATH "${package_dir}/lib" lib_path)
file(TO_CMAKE_PATH "${package_dir}/include/Qt6" include_path)
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" install_prefix)
file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl")
foreach(prl_file IN LISTS prl_files)
file(READ "${prl_file}" _contents)
string(REPLACE "${lib_path}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}")
string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}")
string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}")
#Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release
file(WRITE "${prl_file}" "${_contents}")
endforeach()
endfunction()
function(qt_fixup_and_cleanup)
cmake_parse_arguments(PARSE_ARGV 0 "_qarg" ""
""
"TOOL_NAMES")
vcpkg_copy_pdbs()
## Handle PRL files
qt_fix_prl_files()
## Handle CMake files.
set(COMPONENTS)
file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*")

68
ports/qtbase/cmake/qt_port_details.cmake
View File

@ -1,4 +1,4 @@
set(QT_VERSION 6.2.0)
set(QT_VERSION 6.2.1)
if(PORT MATCHES "qtquickcontrols2")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
@ -56,43 +56,43 @@ set(QT_PORTS qt
foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792)
set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e)
set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3)
set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d)
set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule
set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1)
set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069)
set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686)
set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823)
set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4)
set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c)
set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7)
set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b)
set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba)
set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8)
set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f)
set(qtbase_REF fbdf50b6c6f69ab88d7a53dfb3ab35e2b49a9664)
set(qtshadertools_REF 73deb667b27451340cafc20ead3aeb4ea84a5246)
set(qtdeclarative_REF 3419dd06c5928e292e0c25692427632e124eefea)
set(qt5compat_REF 3f69f4b1e7d07756b9de7629ec22e1c68265c88a)
set(qttools_REF 8e1f1f6e906095a8f2d5ebbf85443e2407d4e07c) # Additional refs in portfile due to submodule
set(qtcoap_REF 1c0bb10d86b43c4b3860cd4526087e644d3f4b07)
set(qtdoc_REF 040ef9a76b5f79d3cf5e42849d5f49a51522dc0f)
set(qtimageformats_REF bd8b167280addfb9b2ee0d493d6cf7b31c03e574)
set(qtmqtt_REF 610543f328127c68ab39960ded51649ad41d3bd4)
set(qtnetworkauth_REF 1987896634a2c4ac23842b366b4704f0b1396de7)
set(qtopcua_REF ae441a8fff3603e7d21957a09a0b3014669bbb0b)
set(qtquicktimeline_REF 6ba89379c0859622d71f75486b8d872cc4a709ca)
set(qtquick3d_REF 7e30ae5f8b6f3c28a2ee2df3788846fc67ec3c1c)
set(qtsvg_REF 30ad9d119079f486817e60025eceffdc0745ffcf)
set(qttranslations_REF 6d297398a2f9b0f7cf67de63369ca7b75ed60034)
set(qtwayland_REF bea7e0ee35211873c90987c905e3fd68d41df4da)
# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2
### New in 6.1
set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d)
set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca)
set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8)
set(qtactiveqt_REF 1b710fa0b5e054189b62e2e7fe32fcf1bec0b081)
set(qtcharts_REF 78a74a1fcdc4329c054691021a65ff00dcd09ebb)
set(qtdatavis3d_REF bec62cdb6f800087fd92085984fde389e9091e13)
#set(qtdeviceutils_REF 0) #missing tag
set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288)
set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344)
set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f)
set(qtlottie_REF 9c72963a986d921e5c1cbdca6638fa17c9f8fa45)
set(qtscxml_REF 069fb385a21e2f844adeb74fbb06849ef5422c7d)
set(qtvirtualkeyboard_REF b6fe68874ed8ff86202320435a743521a245c515)
### New in 6.2
set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30)
set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6)
set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487)
set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc)
set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db)
set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847)
set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047)
set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52)
set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule
set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542)
set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211)
set(qtconnectivity_REF e910b93cc161930748260626b414b7f4241e6d58)
set(qtlocation_REF 70c3948264d5e6e3bc9be4f0e5d8fdae8b821a08)
set(qtmultimedia_REF 64bc1b00b2979866d577eb57fd118ae497cf6391)
set(qtremoteobjects_REF 8876b4e07174b7fe3124de74002730684b1d0d82)
set(qtsensors_REF 8a949e9314682e6940f1b38f30f5d5f3fd1d6260)
set(qtserialbus_REF 709110461a843a9a0236f3cde27414157a088235)
set(qtserialport_REF d8b40852053623d44e8a07f4c208ace27dcde925)
set(qtwebchannel_REF c93ddec0eb35707fafd209bee8472fd6ee4a3cb6)
set(qtwebengine_REF b879b3ed6b4bb7d6951cf430d5e9b49898fe6c9a) # Additional refs in portfile due to submodule
set(qtwebsockets_REF 68a4c96964935ada5ae1ca323713b4e3862f010f)
set(qtwebview_REF 7ef6e31dd2ead012f941ddcaf30e5d4c2abf693b)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")

13
ports/qtbase/fix_qthread_max.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 5dc4d2222..1696dbc80 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -120,7 +120,7 @@ public:
bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever));
bool wait(unsigned long time)
{
- if (time == std::numeric_limits<unsigned long>::max())
+ if (time == (std::numeric_limits<unsigned long>::max)())
return wait(QDeadlineTimer(QDeadlineTimer::Forever));
return wait(QDeadlineTimer(time));
}

1
ports/qtbase/portfile.cmake
View File

@ -17,7 +17,6 @@ set(${PORT}_PATCHES
fix_cmake_build.patch
harfbuzz.patch
fix_egl.patch
fix_qthread_max.patch
)
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)

4
ports/qtbase/qt.conf.in
View File

@ -12,7 +12,7 @@ Data=share/Qt6
Translations=translations/@QT6_DIRECTORY_PREFIX@
Examples=share/examples/@QT6_DIRECTORY_PREFIX@
[Paths]
Prefix=${CURRENT_HOST_INSTALLED_DIR}
Prefix=${CURRENT_INSTALLED_DIR}
Headers=include/@QT6_DIRECTORY_PREFIX@
Libraries=@REL_PATH@lib
Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins
@ -25,7 +25,7 @@ Data=share/Qt6
Translations=translations/@QT6_DIRECTORY_PREFIX@
Examples=share/examples/@QT6_DIRECTORY_PREFIX@
HostPrefix=${CURRENT_HOST_INSTALLED_DIR}
HostData=share/Qt6
HostData=${CURRENT_INSTALLED_DIR}/share/Qt6
HostBinaries=@REL_PATH@bin
HostLibraries=@REL_PATH@lib
HostLibraryExecutables=tools/Qt6/bin

3
ports/qtbase/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qtbase",
"version-semver": "6.2.0",
"port-version": 2,
"version-semver": "6.2.1",
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtcharts/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtcharts",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "QtCharts module",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtcoap/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtcoap",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt CoAP client module",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtconnectivity/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtconnectivity",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Connectivity",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtdatavis3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt 3D data visualization framework",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtdeclarative/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtdoc/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdoc",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Documentation",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtimageformats/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtimageformats",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Additional Image Format plugins for Qt",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtlocation/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtlocation",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Location",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtlottie/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtlottie",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"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/",
"dependencies": [

2
ports/qtmqtt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtmqtt",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
"homepage": "https://www.qt.io/",
"dependencies": [

128
ports/qtmultimedia/3c74340.diff
View File

@ -1,128 +0,0 @@
From 3c7434025c5e14c2b3027a13ce90aab49712156c Mon Sep 17 00:00:00 2001
From: André de la Rocha <andre.rocha@qt.io>
Date: Wed, 06 Oct 2021 02:45:14 +0200
Subject: [PATCH] Fix function declarations
Adding missing QT_WIN_CALLBACK / QT_FASTCALL
Pick-to: 6.2
Change-Id: I5ba5a6341a988f162b9562c9fd328b9d90c6e1ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
index 067c2bb..a525569 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp
+++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
@@ -190,7 +190,7 @@
}
};
-LRESULT deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if (message == WM_DEVICECHANGE) {
auto b = (PDEV_BROADCAST_HDR)lParam;
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index 29e214d..0dc06a4 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -65,7 +65,7 @@
class QWindowsEngine;
class CMMNotificationClient;
-LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM);
+LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM);
class QWindowsMediaDevices : public QPlatformMediaDevices
{
@@ -88,7 +88,7 @@
HDEVNOTIFY m_videoDeviceNotification;
friend CMMNotificationClient;
- friend LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM);
+ friend LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM);
};
QT_END_NAMESPACE
diff --git a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp
index c17f8a6..cada965 100644
--- a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp
+++ b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp
@@ -114,17 +114,17 @@
convert_to_ARGB32_avx2<0, 1, 2, 3>(frame, output);
}
-void qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_avx2<0, 3, 2, 1>(frame, output);
}
-void qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_avx2<3, 0, 1, 2>(frame, output);
}
-void qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_avx2<3, 2, 1, 0>(frame, output);
}
diff --git a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp
index 8c0092e..68abf04 100644
--- a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp
+++ b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp
@@ -96,22 +96,22 @@
}
-void qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_sse2<0, 1, 2, 3>(frame, output);
}
-void qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_sse2<0, 3, 2, 1>(frame, output);
}
-void qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_sse2<3, 0, 1, 2>(frame, output);
}
-void qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_sse2<3, 2, 1, 0>(frame, output);
}
diff --git a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp
index c1acb9b..a5dfdda 100644
--- a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp
+++ b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp
@@ -105,17 +105,17 @@
convert_to_ARGB32_ssse3<0, 1, 2, 3>(frame, output);
}
-void qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_ssse3<0, 3, 2, 1>(frame, output);
}
-void qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_ssse3<3, 0, 1, 2>(frame, output);
}
-void qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output)
{
convert_to_ARGB32_ssse3<3, 2, 1, 0>(frame, output);
}

20
ports/qtmultimedia/FindGObject.patch
View File

@ -1,20 +0,0 @@
diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake
index dc207a2..19a8a67 100644
--- a/cmake/FindGObject.cmake
+++ b/cmake/FindGObject.cmake
@@ -27,13 +27,13 @@
GLIB2::GLIB2
)
else()
- find_path(GGObject_INCLUDE_DIR
+ find_path(GObject_INCLUDE_DIR
NAMES gobject.h
PATH_SUFFIXES glib-2.0/gobject/
)
find_library(GObject_LIBRARY NAMES gobject-2.0)
if (GObject_LIBRARY AND GObject_INCLUDE_DIR)
- add_library(GObject::GObject IMPORTED)
+ add_library(GObject::GObject INTERFACE IMPORTED)
target_include_directories(GObject::GObject INTERFACE
${GObject_INCLUDE_DIR}
)

36
ports/qtmultimedia/FindGStreamer.patch
View File

@ -1,36 +0,0 @@
From 375d2c0ccb602df38ef8f49c5b3e0bf09c24bf46 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 13 Sep 2021 10:50:03 +0200
Subject: Fix build without pkg-config support
Fix several issues in cmake/Find* in the code path that's hit when
pkg-config is not used.
Pick-to: 6.2
Task-number: QTBUG-96401
Change-Id: Iac6af560976ba6408d877027ed44a0354d32d2b7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
---
cmake/FindGStreamer.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'cmake/FindGStreamer.cmake')
diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index 0624c1a77..c3becd731 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -53,8 +53,8 @@ function(find_gstreamer_component component prefix header library)
endif()
if(GStreamer_${component}_LIBRARY AND GStreamer_${component}_INCLUDE_DIR)
add_library(GStreamer::${component} INTERFACE IMPORTED)
- target_include_directories(GStreamer::${component} INTERFACE GStreamer_${component}_INCLUDE_DIR)
- target_link_libraries(GStreamer::${component} INTERFACE GStreamer_${component}_LIBRARY)
+ target_include_directories(GStreamer::${component} INTERFACE ${GStreamer_${component}_INCLUDE_DIR})
+ target_link_libraries(GStreamer::${component} INTERFACE ${GStreamer_${component}_LIBRARY})
endif()
mark_as_advanced(GStreamer_${component}_INCLUDE_DIR GStreamer_${component}_LIBRARY)
endif()
--
cgit v1.2.1

12
ports/qtmultimedia/portfile.cmake
View File

@ -2,12 +2,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES fix_windows_header_include.patch
FindGObject.patch
FindGStreamer.patch
remove_unistd.patch
3c74340.diff)
)
#Maybe TODO: ALSA + PulseAudio? (Missing Ports)
#Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added
# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa)
# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation)
@ -37,6 +35,12 @@ else()
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'")
endif()
if(VCPKG_TARGET_IS_LINUX)
list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON")
else()
list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON")
endif()
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE

7
ports/qtmultimedia/vcpkg.json
View File

@ -1,10 +1,13 @@
{
"name": "qtmultimedia",
"version-semver": "6.2.0",
"port-version": 1,
"version-semver": "6.2.1",
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "alsa",
"platform": "linux"
},
{
"name": "qtbase",
"default-features": false,

2
ports/qtnetworkauth/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Network Authenticators; QtOAuth in particular",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtopcua/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtquick3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtquick3d",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "A new module and API for defining 3D content in Qt Quick.",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtquicktimeline/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtquicktimeline",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Module for keyframe-based timeline construction.",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtremoteobjects/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtremoteobjects",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt distributed object system",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtscxml/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtscxml",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtsensors/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtsensors",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Sensors",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtserialbus/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtserialbus",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Support for CAN and potentially other serial buses.",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtserialport/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtserialport",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Serial Port support",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtshadertools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtshadertools",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"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/",
"dependencies": [

2
ports/qtsvg/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtsvg",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt SVG",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qttools/portfile.cmake
View File

@ -77,7 +77,7 @@ endif()
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML
URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git
REF 908670c5b68d3bcf4712019a028079b8b2042dd4
REF 6af5648d1208ed5760d74bd060c74ffa2bcfef6b
FETCH_REF master
HEAD_REF master
)

3
ports/qttools/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qttools",
"version-semver": "6.2.0",
"port-version": 1,
"version-semver": "6.2.1",
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qttranslations/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qttranslations",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Translations",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtvirtualkeyboard/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtvirtualkeyboard",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtwayland/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwayland",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"supports": "!windows",

2
ports/qtwebchannel/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebchannel",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt WebChannel",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtwebengine/portfile.cmake
View File

@ -73,7 +73,7 @@ endif()
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE
URL git://code.qt.io/qt/qtwebengine-chromium.git
REF 202e34476e934633b3c2e4679a53c4b0847364a8
REF 6b7b3f1bf9f41c3ae7afc359c90c3cc80687f004
)
##### qt_install_submodule

2
ports/qtwebengine/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt WebEngine",
"homepage": "https://www.qt.io/",
"supports": "!static & !((arm | x86) & windows)",

2
ports/qtwebsockets/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebsockets",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt WebSockets",
"homepage": "https://www.qt.io/",
"dependencies": [

2
ports/qtwebview/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebview",
"version-semver": "6.2.0",
"version-semver": "6.2.1",
"description": "Qt Web View",
"homepage": "https://www.qt.io/",
"dependencies": [

74
versions/baseline.json
View File

@ -5433,7 +5433,7 @@
"port-version": 1
},
"qt": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qt-advanced-docking-system": {
@ -5613,7 +5613,7 @@
"port-version": 1
},
"qt5compat": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qt6betablock": {
@ -5621,39 +5621,39 @@
"port-version": 0
},
"qtactiveqt": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtbase": {
"baseline": "6.2.0",
"port-version": 2
"baseline": "6.2.1",
"port-version": 0
},
"qtcharts": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtcoap": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtconnectivity": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtdatavis3d": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtdeclarative": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtdoc": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtimageformats": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtkeychain": {
@ -5661,31 +5661,31 @@
"port-version": 1
},
"qtlocation": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtlottie": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtmqtt": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtmultimedia": {
"baseline": "6.2.0",
"port-version": 1
"baseline": "6.2.1",
"port-version": 0
},
"qtnetworkauth": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtopcua": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtquick3d": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtquickcontrols2": {
@ -5693,67 +5693,67 @@
"port-version": 0
},
"qtquicktimeline": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtremoteobjects": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtscxml": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtsensors": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtserialbus": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtserialport": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtshadertools": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtsvg": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qttools": {
"baseline": "6.2.0",
"port-version": 1
"baseline": "6.2.1",
"port-version": 0
},
"qttranslations": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtvirtualkeyboard": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtwayland": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtwebchannel": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtwebengine": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtwebsockets": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"qtwebview": {
"baseline": "6.2.0",
"baseline": "6.2.1",
"port-version": 0
},
"quadtree": {

5
versions/q-/qt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "21c442fd3e940a2ee9a83377da9a8e902539b51b",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "420d2198ead04223b9c2901f9c1078b6f956cf44",
"version-semver": "6.2.0",

5
versions/q-/qt5compat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aab367de0f2bfab12d47c09e3a5baf3a04be6d1b",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "374ed713fb29fa32bc126a93372be23a0fc85ff3",
"version-semver": "6.2.0",

5
versions/q-/qtactiveqt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b4f9c648d93abf2dc5547a0c966f268809eeb58",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "c7d57c70efabceaca7d833b441ad986c4eebb09b",
"version-semver": "6.2.0",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "85405a7d213571f8da152112d436292099c5a4ab",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31",
"version-semver": "6.2.0",

5
versions/q-/qtcharts.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "68535daef3629a70ff0e5a347580f747aa075070",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "e9849e3eaccce1a69b18aab5c6bd84e952960b3a",
"version-semver": "6.2.0",

5
versions/q-/qtcoap.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1397bf94a76801daaec069dbbc790dc45957ccaa",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "684cdbc0cd6c1df0f94c3057722649ea22c23d5b",
"version-semver": "6.2.0",

5
versions/q-/qtconnectivity.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0ed1e678661df3b938f67e6d9f8d68e62f8f75b6",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "c646047361feb006e3d5ab1d29412de763c4c505",
"version-semver": "6.2.0",

5
versions/q-/qtdatavis3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "64b4f2709811c4ab542a8534645e0ffdb1ffffe7",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "80e7cb3d96c9ecf079d94b39d06d1eb19fbe6bdc",
"version-semver": "6.2.0",

5
versions/q-/qtdeclarative.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3abe1c5e7e0fee7e89e99635bb1c7b4136854c2e",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "cc859e66bbcb0a45c5476ea8d882ce9c05af1e66",
"version-semver": "6.2.0",

5
versions/q-/qtdoc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d2640b87a1d668eeb0021bb55e7957f3d0d507e0",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "1c752aec2e3f90c70b41895bba5165bc86f14f06",
"version-semver": "6.2.0",

5
versions/q-/qtimageformats.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e500b15fc978066e6c781d3d7f54867b31c8a77c",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "524dcbf6d624cf260f30c9c38a9823a089e5795f",
"version-semver": "6.2.0",

5
versions/q-/qtlocation.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7aeba7169d9ebb502e2fb276d36eaf0b562cefd7",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "ce4d2a217a74a82545c0ec6f5dcb343bedad3f6a",
"version-semver": "6.2.0",

5
versions/q-/qtlottie.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "73dbf3d8520fa5aba164701b37217ec55dbfc16d",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "a1ac4e53ead69723b671e153edd918c818380668",
"version-semver": "6.2.0",

5
versions/q-/qtmqtt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "07e0bf2df2183ec6fb51a6f8d11a1ec3fb27a499",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "eca54f4259f492a6898e3108dbb0917eb52ff91f",
"version-semver": "6.2.0",

5
versions/q-/qtmultimedia.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e5a5554e1e9e997f82d4a90933b6a2edd2d0a2b0",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "e632d54bc7aea99a619c091cd43ea42e16ccefc2",
"version-semver": "6.2.0",

5
versions/q-/qtnetworkauth.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5aa75624c0e5b7b13380a7c7b6f0a8cc4deec8d8",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "278a506f659c274c02bd9d811510b37f4574fd9c",
"version-semver": "6.2.0",

5
versions/q-/qtopcua.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9e3856e0b345b9b27921eadc6d45115fe70fa26",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "d61483af1def3a289ff148e0389d6d1d11011b13",
"version-semver": "6.2.0",

5
versions/q-/qtquick3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4431f13552a344e856d7c1486d1cd0b51649b372",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "a916150c6157e85d5d303817cd21e61d59061d73",
"version-semver": "6.2.0",

5
versions/q-/qtquicktimeline.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8721d7b3901d80a38f30a05a27a9f111356611b5",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "34391c636963d95d64bb987d2edc1f75cbefa322",
"version-semver": "6.2.0",

5
versions/q-/qtremoteobjects.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "68c5454488b9c71989413817c7be02e3f758b11d",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "ef23f0d4f92edb51f9343655d0e9323395603dd7",
"version-semver": "6.2.0",

5
versions/q-/qtscxml.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f614e8155cd17d2720c1d8ad027b6655fbd5a744",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "d174181a7c25a7f71ae1bb4ee31baa3e1c2aae77",
"version-semver": "6.2.0",

5
versions/q-/qtsensors.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1aa5854f556f4f448a406daf6fe368a91a5a0b15",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "972ae47281fcab019fe1c4802f207505538177a2",
"version-semver": "6.2.0",

5
versions/q-/qtserialbus.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce2504f7bda386450268832846376a48529bce73",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "fd16c70a834bf87bd68c99c997beb1765c556e80",
"version-semver": "6.2.0",

5
versions/q-/qtserialport.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce4ab156356f3dcfe3fabbaf3f447ebbcd83972a",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "a14aaf079ec45dcd20bafaa8634a9474a70902f5",
"version-semver": "6.2.0",

5
versions/q-/qtshadertools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e5831c09c8eaf4936eaef1c9a52079fc4e9ffa0f",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "c6e147b845c4bb60aede54ad9fcd6f6c8daad81b",
"version-semver": "6.2.0",

5
versions/q-/qtsvg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa7f5015760b1bc7f653f30b170c1201a437cd86",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "7513170430df20e23c5013792b6c2fed5b82f7ba",
"version-semver": "6.2.0",

5
versions/q-/qttools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb472063be2d7b507cb027c217564f9288b24482",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "7473cbd91e3a1f662866cd695e94ff6a96a9cfb4",
"version-semver": "6.2.0",

5
versions/q-/qttranslations.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9bf7f8aa0d90f72017d2e47f1a5628a93265b824",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "b6d759670e59feae1c8f81cc8e176cdd6f4f0b38",
"version-semver": "6.2.0",

5
versions/q-/qtvirtualkeyboard.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8b26db2df575c2b7a0341c7aaea9b88ee4e017b2",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "19665ad160707c2d22a6a1bc26ff9dc4a31a3304",
"version-semver": "6.2.0",

5
versions/q-/qtwayland.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5801a51524f383c98f98da3d085cad1ecc338ca6",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "c2cf1a6edea89674bb5bdd2e3d1e9322055da7fd",
"version-semver": "6.2.0",

5
versions/q-/qtwebchannel.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "963ccd119990c7c3ae09e323da25a38b4893df78",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "f1a82a47775e3c354e5b2b6cb5d39aa2317a1e9b",
"version-semver": "6.2.0",

5
versions/q-/qtwebengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4c69c49d9fe8599dd22538d9cef12e09cb29778e",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "47de546e07339c97ba827fa8b5ceba4d7198d561",
"version-semver": "6.2.0",

5
versions/q-/qtwebsockets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1c23c3b938eaf83f287a460d95695732a4b784d3",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "929a30289035e2424ecac2ae6c4059ec47820134",
"version-semver": "6.2.0",

5
versions/q-/qtwebview.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "04d26846445cac21376cf3b80264394fb6a83778",
"version-semver": "6.2.1",
"port-version": 0
},
{
"git-tree": "f2d149cd37a47e54925f0e57aec8cb9816e10473",
"version-semver": "6.2.0",