3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[Qt 6.2] Update Qt6 to 6.2 (#18687)

Browse Source 
* [qt6] Update to 6.1.1

* version stuff

* fix empty dir

* update version

* fix casing in qtbase

* [libpq] add secure32.lib on windows

* add clang-cl fix

* version stuff

* fix flag removal by adding a space

* version stuff

* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q

* fix libpq wrapper opensll linkage on linux

* use policy to fix dependent ports

* version stuff

* use upstream patch

* version stuff

* fix source_location with clang-cl

* version stuff

* add all new modules

* add all modules to the qt port

* push all the ports

* fix patch

* update ports

* split qt_install_submodule into smaller functions

* add qlitehtml submodule to qttools

* update a few ports before moving to beta

* update vcpkg.json and refs and fix issue with update

* fix dependencies

* remove patch

* update to 6.2

* add nodejs to vcpkg_find_acquire_program for qtwebengine

* format manifest.

* fix webengine and see if it builds.

* apply format diff

* add patch

* fix arm builds

* fix linux gcc 7.5 build error

* fix patch

* bump version in qtbase otherwise CI seems to resuse the wrong version

* fix webengine release build

* try fixing gcc 7.5 build

* revert gcc 7.5 fixes since they broke osx

* revert gcc 7.5 fixes since they broke osx

* fix qtimageformats.

* actually enable new qt6 builds.

* fix search path for nodejs.

* fix the webengine patch again.

* fix wrong binary name

* revisit all dependencies

* revisit webengine features and build settings

* more feature stuff

* remove qt6betablock and more features review for qt 6.2

* add missing qt prefix.

* format manifest

* fix ci issues

* format manifest.

* add node on osx.

* install node on linux

* fix a typo and a disable another find_package

* fix mingw build issues and switch to not using tag

* use CMAKE_HOST_WIN32 instead

* update ref

* fix core configure error

* fix mingw case.

* fix script installation

* remove qmake helper scrpt

* delete debug folder if empty

* add vcpkg-tool-nodejs

* revert changes in the pipeline scripts

* adjust qtwebengine to the changes

* format manifest and revert doc changes

* fix message and logic

* fix hashes and make host only port

* fix hash again?

* qttools add linguist feature for crossbuilds

* fix dependency

* add thread and future to concurrent feature

* add assistant as a required host feature
(somebody should tell Qt not to do that)

* fix dependency.

* [skip ci] not a host dep?!?

* [skip ci] debuging

* [skip ci] more debug messages

* [skip ci] try always redownloading

* [skip ci] fix hash und skip hash for redownloading once

* [skip ci] comment out skip sha and redownload

* add vcpkg_fixup_pkgconfig to libvpx

* qtwebengine requires qml and quick

* fix manifest format

* qtwebengine does not support static builds!

* remove unnecessary parts of the patch

* update to beta2

* add some " and a message in update mode

* [skip ci] remove old and reorder patches

* [skip ci] add qtpaths6

* [skip actions] fix webengine patch

* [skip actions] fix a few submodule refs

* [skip actions] fix qtwebengine

* [skip actions] remove qml feature from webengine in qt metaport

* qtdeclarative raise minimum cmake version

* use the tree id instead?

* [skip actions] raise minimum cmake version in qtquick3d

* fix fetching of unadvertised commit ids

* revert changes to vcpkg_from_git

* revert doc changes

* [skip actions] use the new FETCH_REF

* [skip actiosn] remove raise of minimum version to retry with new cmake version

* [skip actions] update to beta3

* revert removal of patch

* update to beta4
remove qtquickcontrols2 deps

* fix missing \

* [skip actions] fix gstreamer feature on windows

* [skip actions]
remove outdated patches
format qtmultimedia

* [skip actions] update to rc1

* [skip actions] remove patch for now

* update refs

* [skip actions] comment patch to try another patch in qtmultimedia

* x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.)

* Finalize for 6.2 release.
Open issues: QtWebengine and cross builds.

* version stuff

* fix semver in qtquickcontrols.

* version stuff

* revise qtwebengine supports expression

* update version
This commit is contained in:
Alexander Neumann 2021-09-30 22:03:56 +02:00 committed by GitHub
parent 8ad33ead90
commit 35bfef7084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
116 changed files with 1804 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
ports/qt/vcpkg.json
View File

@ -1,33 +1,149 @@
{
"name": "qt",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt",
"homepage": "https://www.qt.io/",
"dependencies": [
"qt5compat",
{
"name": "qt5compat",
"default-features": false,
"features": [
"big-codecs",
"codecs",
"qml",
"textcodec"
]
},
{
"name": "qtbase",
"default-features": false
},
"qtcharts",
{
"name": "qtcharts",
"default-features": false,
"features": [
"designer",
"qml"
]
},
"qtcoap",
"qtconnectivity",
"qtdatavis3d",
"qtdeclarative",
"qtdoc",
"qtimageformats",
"qtlottie",
{
"name": "qtimageformats",
"default-features": false,
"features": [
"jasper",
"tiff",
"webp"
]
},
{
"name": "qtlocation",
"default-features": false,
"features": [
"nmea",
"qml"
]
},
{
"name": "qtlottie",
"default-features": false,
"features": [
"qml"
]
},
"qtmqtt",
{
"name": "qtmultimedia",
"default-features": false,
"features": [
"gstreamer",
"qml",
"widgets"
]
},
"qtnetworkauth",
"qtopcua",
"qtquick3d",
"qtquickcontrols2",
{
"name": "qtopcua",
"features": [
"qml"
]
},
{
"name": "qtquick3d",
"default-features": false
},
"qtquicktimeline",
"qtscxml",
{
"name": "qtremoteobjects",
"default-features": false,
"features": [
"qml"
]
},
{
"name": "qtscxml",
"default-features": false,
"features": [
"qml"
]
},
{
"name": "qtsensors",
"default-features": false,
"features": [
"qml"
]
},
"qtserialbus",
"qtserialport",
"qtshadertools",
"qtsvg",
"qttools",
{
"name": "qttools",
"default-features": false,
"features": [
"assistant",
"designer",
"qml"
]
},
"qttranslations",
"qtvirtualkeyboard"
"qtvirtualkeyboard",
{
"name": "qtwebchannel",
"default-features": false,
"features": [
"qml"
]
},
{
"name": "qtwebengine",
"default-features": false,
"features": [
"geolocation",
"spellchecker",
"webchannel"
]
},
{
"name": "qtwebsockets",
"default-features": false,
"features": [
"qml"
]
},
{
"name": "qtwebview",
"default-features": false,
"features": [
"qml",
"webengine"
]
}
],
"default-features": [
"default-features"
@ -38,10 +154,16 @@
"dependencies": [
{
"name": "qtactiveqt",
"features": [
"qml"
],
"platform": "windows"
},
{
"name": "qtwayland",
"features": [
"qml"
],
"platform": "linux"
}
]

5
ports/qt5compat/portfile.cmake
View File

@ -12,6 +12,7 @@ FEATURES
"iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU
INVERTED_FEATURES
"iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
#For iconv feature to work the following must be true:
@ -26,3 +27,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)
#For my documentation:
# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick)

19
ports/qt5compat/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "The module contains unsupported Qt 5 APIs",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -13,6 +13,7 @@
"big-codecs",
"codecs",
"default-features",
"qml",
"textcodec"
],
"features": {
@ -56,6 +57,22 @@
}
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
{
"name": "qtdeclarative",
"default-features": false
}
]
},
"textcodec": {
"description": "Supports conversions between text encodings."
}

1
ports/qt6betablock/portfile.cmake
View File

@ -1 +0,0 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

12
ports/qt6betablock/vcpkg.json
View File

@ -1,12 +0,0 @@
{
"name": "qt6betablock",
"version-semver": "6.2.0-beta",
"description": "Port to block qt6 ports not in the current release to be build in CI",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
}
]
}

8
ports/qtactiveqt/portfile.cmake
View File

@ -17,9 +17,15 @@ if(NOT NO_BIN_AND_TOOLS)
)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

26
ports/qtactiveqt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"supports": "windows",
@ -11,12 +11,24 @@
"default-features": false
},
{
"$comment": "also requires printsupport!",
"name": "qtbase",
"default-features": false
},
{
"name": "qttools",
"default-features": false
"default-features": false,
"features": [
"gui",
"widgets"
]
}
]
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

130
ports/qtbase/20b3eb0.diff
View File

@ -1,130 +0,0 @@
From 20b3eb0fd8b5f82cf432f2c06e7c5d3f533df0a5 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Thu, 03 Jun 2021 12:42:07 +0200
Subject: [PATCH] CMake: Add support for building with clang-cl
qmake had support for building with clang-cl as the win32-clang-msvc mkspec.
Task-number: QTBUG-89642
Task-number: QTBUG-88081
Change-Id: I0709c289f90fedb121620d1e67ef841602219816
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index bb8b146..792276e 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -285,7 +285,9 @@
list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64)
endif()
if(MSVC)
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+ if (CLANG)
+ set(QT_DEFAULT_MKSPEC win32-clang-msvc)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(QT_DEFAULT_MKSPEC win32-arm64-msvc)
else()
set(QT_DEFAULT_MKSPEC win32-msvc)
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
index 0c57d9e..0eeccce 100644
--- a/cmake/QtFlagHandlingHelpers.cmake
+++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -235,7 +235,7 @@
function(qt_set_msvc_cplusplus_options target visibility)
# For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus.
# Check qt_config_compile_test for more info.
- if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
+ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1913)
target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-")
endif()
endfunction()
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 2c991f7..9f0c95e 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -263,4 +263,24 @@
# special case end
)
+if (MSVC AND CLANG)
+ foreach(subarch sse4_1 rdrnd rdseed)
+ if (TEST_subarch_${subarch})
+ qt_internal_add_simd_part(Core SIMD ${subarch}
+ SOURCES
+ global/qsimd.cpp
+ )
+ endif()
+ endforeach()
+
+ foreach(subarch sse4_1 aesni)
+ if (TEST_subarch_${subarch})
+ qt_internal_add_simd_part(Core SIMD ${subarch}
+ SOURCES
+ tools/qhash.cpp
+ )
+ endif()
+ endforeach()
+endif()
+
# special case begin
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index 5869751..6108b07 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -62,17 +62,22 @@
# define _POSIX_
# include <limits.h>
# undef _POSIX_
-#endif
-#include <qcoreapplication.h>
-#include <qcoreevent.h>
-#include <qiodevice.h>
-#include <qlist.h>
-#include <qvariant.h> /* All moc genereated code has this include */
-#include <qobject.h>
-#include <qregularexpression.h>
-#include <qscopedpointer.h>
-#include <qshareddata.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+# if defined(Q_CC_CLANG) && defined(Q_CC_MSVC)
+// See https://bugs.llvm.org/show_bug.cgi?id=41226
+# include <wchar.h>
+__declspec(selectany) auto *__wmemchr_symbol_loader_value = wmemchr(L"", L'0', 0);
+# endif
+# endif
+# include <qcoreapplication.h>
+# include <qcoreevent.h>
+# include <qiodevice.h>
+# include <qlist.h>
+# include <qvariant.h> /* All moc genereated code has this include */
+# include <qobject.h>
+# include <qregularexpression.h>
+# include <qscopedpointer.h>
+# include <qshareddata.h>
+# include <qstring.h>
+# include <qstringlist.h>
+# include <qtimer.h>
#endif
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 5fe4d59..04f58dd 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -577,6 +577,15 @@
)
endif()
+ if (MSVC AND CLANG AND TEST_subarch_sse4_1)
+ qt_internal_add_simd_part(Gui SIMD sse4_1
+ SOURCES
+ painting/qdrawhelper.cpp
+ painting/qdrawhelper_sse2.cpp
+ painting/qdrawhelper_ssse3.cpp
+ )
+ endif()
+
qt_internal_add_simd_part(Gui SIMD ssse3
SOURCES
image/qimage_ssse3.cpp

41
ports/qtbase/buildcmake.patch
View File

@ -1,41 +0,0 @@
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index d08126731..efd1ada92 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -387,7 +387,7 @@ set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools"
# Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise
# it might not get installed.
-unset(QT_SYNCQT CACHE)
+# unset(QT_SYNCQT CACHE)
# For adjusting variables when running tests, we need to know what
# the correct variable is for separating entries in PATH-alike
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index 9eb913f4d..286f3287e 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -35,8 +35,8 @@ endif()
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
-"A path to the source tree of the previously configured QtBase project." FORCE)
+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
+# "A path to the source tree of the previously configured QtBase project." FORCE)
# Propagate decision of building tests and examples to other repositories.
set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.")
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
index 30d3bd6d3..80bb2bf46 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -222,7 +222,7 @@ function(qt_internal_walk_libs
qt_internal_should_not_promote_package_target_to_global(
"${lib_target_unaliased}" should_not_promote)
if(NOT is_global AND is_imported AND NOT should_not_promote)
- set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
+ #set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
endif()
endif()
else()

2
ports/qtbase/clang-cl_source_location.patch
View File

@ -9,6 +9,6 @@ index 823b2057b..4a8cd4fa8 100644
-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC)
+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval)
#include <source_location>
#if defined(__cpp_lib_source_location)
#if defined(__cpp_lib_source_location)
#define QT_SOURCE_LOCATION_NAMESPACE std
#define QT_PROPERTY_COLLECT_BINDING_LOCATION

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

@ -32,7 +32,6 @@ function(qt_download_submodule)
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://code.qt.io/qt/${PORT}.git"
#TAG ${${PORT}_TAG}
REF "${${PORT}_REF}"
${UPDATE_PORT_GIT_OPTIONS}
PATCHES ${_qarg_PATCHES}
@ -245,4 +244,4 @@ function(qt_install_submodule)
qt_install_copyright("${SOURCE_PATH}")
set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE)
endfunction()
endfunction()

106
ports/qtbase/cmake/qt_port_details-latest.cmake
View File

@ -1,12 +1,21 @@
set(QT_VERSION 6.1.0-beta3)
set(QT_GIT_TAG v${QT_VERSION})
#set(QT_UPDATE_VERSION TRUE)
set(QT_IS_LATEST 1)
# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules
#https://wiki.qt.io/Get_the_Source
#TODO:qtknx?
set(QT_VERSION 6.2.0)
set(QT_PORTS qtbase
if(PORT MATCHES "qtquickcontrols2")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!")
return()
endif()
set(QT_GIT_TAG v${QT_VERSION})
#set(QT_UPDATE_VERSION TRUE)
if(QT_UPDATE_VERSION)
function(vcpkg_extract_source_archive)
endfunction()
endif()
set(QT_IS_LATEST 1)
set(QT_PORTS qt
qtbase
qttools
qtdeclarative
qtsvg
@ -22,8 +31,8 @@ set(QT_PORTS qtbase
qtimageformats
qtmqtt
qtnetworkauth
qtquickcontrols2
###
# qtquickcontrols2 -> moved into qtdeclarative
## New in 6.1
qtactiveqt
qtdatavis3d
#qtdeviceutils
@ -31,38 +40,60 @@ set(QT_PORTS qtbase
qtscxml
qtvirtualkeyboard
qtcharts
## New in 6.2
qtconnectivity
qtlocation
qtmultimedia
qtremoteobjects
qtsensors
qtserialbus
qtserialport
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
)
# New: qtactiveqt qtdatavis3d qtlottie qtscxml qtvirtualkeyboard qtcharts
foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
set(qtbase_REF 089b73de033190e511c0bd11cba22160024ef9a4)
set(qttools_REF a810532b7f68348281bac13fc03395bf08827c28)
set(qtdeclarative_REF 1e4730ae0f44ece8ff8a27d4de127d8da9ed8a13)
set(qtsvg_REF 1adf841f16cab093f7db6a1fbffd088b138afed3)
set(qt5compat_REF 6ab304e8d2fe7f58cf608f8a30abbf769680f027)
set(qtshadertools_REF c26caefc6f67f01ae52372a70d3887077477388d)
set(qtquicktimeline_REF a91e82010047c9422d573b4c8648c175b470839e)
set(qtquick3d_REF f6614a31bd8a092d2081092dc7043ead9e7475ea)
set(qttranslations_REF 8a39fca4b56817fa2f7393fd5c5850bb167ac8f3)
set(qtwayland_REF 8237b7384537e3bc1687c1e05a20d450a6ed38f3)
set(qtdoc_REF 9259552281e4322a63f2cd0edce7904af1147bca)
set(qtimageformats_REF acd9ad1f69606553bc975fb33ae4efd52b2fbe9f)
set(qtmqtt_REF 3bdd419302de7e1e8a819509d115c32d2fbf4d49)
set(qtquickcontrols2_REF a74819563efc3495a86a696e678bec11bab33ec6)
set(qtnetworkauth_REF 92a1ff5b63f56e77030cdfbe9c456a31d3a2d5e2)
set(qtcoap_REF bc8f5ff0e678aa4b4c9081e543fd7c119754a3a1)
set(qtopcua_REF 0cd72d5e9cfaaf96b6d9a2d4ce4a6c46ffbbcdd4)
###
set(qtactiveqt_REF 94a100baa75248ba49c01680ca3632cd7180a8e8)
set(qtdatavis3d_REF c1e7a47f47cc289652f2004403cb1e587308c290)
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(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(qtdeviceutils_REF 0) #missing tag
set(qtlottie_REF ddda33a7294512487035de6338a91657501c9fd2)
set(qtscxml_REF 8e2ad5c798110337b90c582c68e903465e19e3fe)
set(qtvirtualkeyboard_REF 266626a0414aef2fcc65d412f02c993c87a1cae6)
set(qtcharts_REF 962a05cea44108d13f081a12bd53232ef856427c)
set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288)
set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344)
set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f)
### 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)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")
@ -72,7 +103,8 @@ if(QT_UPDATE_VERSION)
foreach(_current_qt_port IN LISTS QT_PORTS)
set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json")
file(READ "${_current_control}" _control_contents)
string(REGEX REPLACE "\"version-string\": [^\n]+\n" "\"version-string\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}")
file(WRITE "${_current_control}" "${_control_contents}")
#need to run a vcpkg format-manifest --all after update once
endforeach()

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

@ -1,15 +1,20 @@
set(QT_VERSION 6.1.3)
set(QT_VERSION 6.2.0)
if(PORT MATCHES "qtquickcontrols2")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!")
return()
endif()
set(QT_GIT_TAG v${QT_VERSION})
#set(QT_UPDATE_VERSION TRUE)
if(QT_UPDATE_VERSION)
function(vcpkg_extract_source_archive)
endfunction()
endif()
# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules
#https://wiki.qt.io/Get_the_Source
#TODO:qtknx?
set(QT_PORTS qtbase
set(QT_PORTS qt
qtbase
qttools
qtdeclarative
qtsvg
@ -25,7 +30,8 @@ set(QT_PORTS qtbase
qtimageformats
qtmqtt
qtnetworkauth
qtquickcontrols2
# qtquickcontrols2 -> moved into qtdeclarative
## New in 6.1
qtactiveqt
qtdatavis3d
#qtdeviceutils
@ -33,46 +39,71 @@ set(QT_PORTS qtbase
qtscxml
qtvirtualkeyboard
qtcharts
qt
## New in 6.2
qtconnectivity
qtlocation
qtmultimedia
qtremoteobjects
qtsensors
qtserialbus
qtserialport
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
)
foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
set(qtbase_REF 3ff48409ed14c7a63010b14e053a7201a61391c5)
set(qttools_REF a69e290e25fd145a8b02223130192555f7962ea2)
set(qtdeclarative_REF 38845e18ef11ac2f1a1db82377b30f1649fdc499)
set(qtsvg_REF 24d635154689be46aaaf2ba0e3538d2f8fafeb3d)
set(qt5compat_REF fcacd7f544b496420db485187aa55d76898ce73d)
set(qtshadertools_REF 06fc3c49b7b8cba80e6b6ff31ac5d703e3a2abcb)
set(qtquicktimeline_REF be6321dc5164657072ff7069a7132d44222a503c)
set(qtquick3d_REF ccd45eb39ec1fb88d62438c9dd0007e26c0ccc18)
set(qttranslations_REF 2d30ad16d90abfc0806d28e3504348df84b1e62b)
set(qtwayland_REF 501c287f34a66ec89e3e49da218feb4bc69c9c5e)
set(qtdoc_REF 13fa00e32307bae90884a608880a542f6ed90646)
set(qtimageformats_REF 8d6e8efc1afbd5e9cf793fbf0507e1d332c45d1f)
set(qtmqtt_REF a6213a104f65dccb13508b58b0f07a249d9922c8)
set(qtquickcontrols2_REF 6d62c0677d60e42a19bb72d641129933770f7723)
set(qtnetworkauth_REF 7ce9e47b469141f9bace9661d07999dcc120e7f6)
set(qtcoap_REF 83b5b7e8e2c6afa9d5ab69123c40993c48b30970)
set(qtopcua_REF bda48fd7729fb65a7504a1bada496489ee15d245)
set(qtactiveqt_REF 32cad4a02f78205e85490f6b8cbde82ecb1b5f2f)
set(qtdatavis3d_REF 8d6c15fa8daa68a4d48368b8ceb8c517e973eac7)
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(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(qtdeviceutils_REF 0) #missing tag
set(qtlottie_REF 266531117ba6646893d3806566144aff19d5e309)
set(qtscxml_REF aa27d28e302f3529940172ab2782c2d7e28fb532)
set(qtvirtualkeyboard_REF eb26e2af30e6cbb2c4b9224d8e9f489f198c82f0)
set(qtcharts_REF 3e0d6ffa572efe8a09774ac6c6263b6df5eaf718)
set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288)
set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344)
set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f)
### 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)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")
set(_VCPKG_INTERNAL_NO_HASH_CHECK 1)
if("${PORT}" MATCHES "qtbase")
file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake")
foreach(_current_qt_port IN LISTS QT_PORTS)
set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json")
file(READ "${_current_control}" _control_contents)
string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}")
file(WRITE "${_current_control}" "${_control_contents}")
#need to run a vcpkg format-manifest --all after update once
endforeach()

15
ports/qtbase/fix_cmake_build.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index ffc9d90f8..0b3a7d59e 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -51,8 +51,8 @@ endif()
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
-"A path to the source tree of the previously configured QtBase project." FORCE)
+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
+# "A path to the source tree of the previously configured QtBase project." FORCE)
# Propagate decision of building tests and examples to other repositories.
set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.")

12
ports/qtbase/fix_egl.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
index eafbc1ff9..dd4068838 100644
--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
@@ -82,6 +82,7 @@ find_path(EGL_INCLUDE_DIR
find_library(EGL_LIBRARY
NAMES
EGL
+ libEGL # required to find angle on windows within vcpkg.
HINTS
${PKG_EGL_LIBRARY_DIRS}
)

13
ports/qtbase/fix_find_dep.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40c410aeb..c36084fb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ project(QtBase
LANGUAGES CXX C ASM
)
+find_package(Threads REQUIRED)
+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE)
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)

22
ports/qtbase/jpeg.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index 29bf5ab58..1a3cfd2bf 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -63,12 +63,12 @@
extern "C" {
// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with
// some Windows headers that may or may not have been included
-#ifdef HAVE_BOOLEAN
-# undef HAVE_BOOLEAN
-#endif
-#define boolean jboolean
+//#ifdef HAVE_BOOLEAN
+//# undef HAVE_BOOLEAN
+//#endif
+//#define boolean jboolean
-#define XMD_H // shut JPEGlib up
+//#define XMD_H // shut JPEGlib up
#include <jpeglib.h>
#ifdef const
# undef const // remove crazy C hackery in jconfig.h

35
ports/qtbase/portfile.cmake
View File

@ -1,23 +1,27 @@
set(QT_IS_LATEST OFF)
# Reminder for myself and everybody else:
# Qt cross module dependency information within the Qt respository is wrong and/or incomplete.
# Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets
# Often enough certain (bigger) dependencies are only used to build examples and/or tests.
# As such getting the correct dependency information relevant for vcpkg requires a manual search/check
#set(QT_IS_LATEST ON)
## All above goes into the qt_port_hashes in the future
include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake")
set(${PORT}_PATCHES
jpeg.patch
harfbuzz.patch
config_install.patch
allow_outside_prefix.patch
buildcmake.patch
dont_force_cmakecache.patch
fix_find_dep.patch
20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch.
clang-cl_source_location.patch
config_install.patch
dont_force_cmakecache.patch
fix_cmake_build.patch
harfbuzz.patch
fix_egl.patch
)
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
list(APPEND ${PORT}_PATCHES
)
)
endif()
if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
@ -58,6 +62,8 @@ FEATURES
"zstd" FEATURE_zstd
"framework" FEATURE_framework
"concurrent" FEATURE_concurrent
"concurrent" FEATURE_future
"concurrent" FEATURE_thread
"dbus" FEATURE_dbus
"gui" FEATURE_gui
"network" FEATURE_network
@ -87,13 +93,11 @@ INVERTED_FEATURES
"glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2
)
#list(APPEND FEATURE_CORE_OPTIONS -DFEATURE_doubleconversion:BOOL=ON)
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)
# Network features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS
FEATURES
@ -205,6 +209,8 @@ set(TOOL_NAMES
rcc
tracegen
uic
qtpaths
qtpaths6
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
@ -255,12 +261,13 @@ file(COPY
qt_stop_on_update()
set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests)
if(VCPKG_TARGET_IS_WINDOWS)
if(CMAKE_HOST_WIN32)
set(script_suffix .bat)
else()
set(script_suffix)
endif()
set(other_files
target_qt.conf
qt-cmake-private-install.cmake
syncqt.pl
android_cmakelist_patcher.sh
@ -297,8 +304,10 @@ foreach(_config debug release)
endforeach()
endforeach()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
if(VCPKG_CROSSCOMPILING)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script
endif()
file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*")
if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/")

2
ports/qtbase/vcpkg.json
View File

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

8
ports/qtcharts/portfile.cmake
View File

@ -3,8 +3,14 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

34
ports/qtcharts/vcpkg.json
View File

@ -1,18 +1,36 @@
{
"name": "qtcharts",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "QtCharts module",
"homepage": "https://www.qt.io/",
"dependencies": [
"qtdeclarative",
"qttools"
],
"default-features": [
"default-features"
{
"name": "qtbase",
"default-features": false,
"features": [
"gui",
"widgets"
]
}
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
"designer": {
"description": "Build Designer plugin",
"dependencies": [
{
"name": "qttools",
"default-features": false
}
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

2
ports/qtcoap/portfile.cmake
View File

@ -4,7 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

17
ports/qtcoap/vcpkg.json
View File

@ -1,20 +1,15 @@
{
"name": "qtcoap",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt CoAP client module",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"network"
]
}
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
]
}

10
ports/qtconnectivity/portfile.cmake Normal file
View File

@ -0,0 +1,10 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

17
ports/qtconnectivity/vcpkg.json Normal file
View File

@ -0,0 +1,17 @@
{
"name": "qtconnectivity",
"version-semver": "6.2.0",
"description": "Qt Connectivity",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"dbus",
"gui",
"network"
]
}
]
}

10
ports/qtdatavis3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt 3D data visualization framework",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -8,9 +8,13 @@
"name": "qtbase",
"default-features": false,
"features": [
"gui"
"gui",
"testlib"
]
},
"qttools"
{
"name": "qtdeclarative",
"default-features": false
}
]
}

15
ports/qtdeclarative/fix_alignment.patch
View File

@ -1,15 +0,0 @@
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h
index 612c2dd4530..17e47e1b059 100644
--- a/src/qml/jsruntime/qv4enginebase_p.h
+++ b/src/qml/jsruntime/qv4enginebase_p.h
@@ -88,7 +88,9 @@ struct Q_QML_EXPORT EngineBase {
MemoryManager *memoryManager = nullptr;
qint32 callDepth = 0;
- quint8 padding2[QT_POINTER_SIZE - sizeof(quint32)];
+#if QT_POINTER_SIZE == 8
+ quint32 padding2;
+#endif
Object *globalObject = nullptr;
Value *jsStackLimit = nullptr;
Value *jsStackBase = nullptr;

5
ports/qtdeclarative/portfile.cmake
View File

@ -1,10 +1,6 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
if(QT_IS_LATEST)
set(${PORT}_PATCHES fix_alignment.patch)
endif()
set(TOOL_NAMES
qml
qmlcachegen
@ -19,6 +15,7 @@ endif()
qmltestrunner
qmltime
qmltyperegistrar
qmldom
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}

6
ports/qtdeclarative/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -15,6 +15,10 @@
"name": "qtdeclarative",
"host": true,
"default-features": false
},
{
"name": "qtshadertools",
"default-features": false
}
]
}

2
ports/qtdoc/portfile.cmake
View File

@ -2,10 +2,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
set(TOOL_NAMES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG

13
ports/qtdoc/vcpkg.json
View File

@ -1,21 +1,12 @@
{
"name": "qtdoc",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Documentation",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
},
"qtdeclarative"
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
]
}

22
ports/qtimageformats/no_target_promotion.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fdd7ddbd..f189c472c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,16 @@ project(QtImageFormats # special case
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
)
-
+find_package(Threads)
+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE)
+find_package(ZLIB)
+if(TARGET ZLIB::ZLIB)
+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE)
+endif()
+find_package(JPEG)
+if(TARGET JPEG::JPEG)
+ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE)
+endif()
# special case begin
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)

2
ports/qtimageformats/portfile.cmake
View File

@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
set(${PORT}_PATCHES no_target_promotion.patch)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES

2
ports/qtimageformats/vcpkg.json
View File

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

23
ports/qtlocation/portfile.cmake Normal file
View File

@ -0,0 +1,23 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort
"nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network
)
list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON"
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

44
ports/qtlocation/vcpkg.json Normal file
View File

@ -0,0 +1,44 @@
{
"name": "qtlocation",
"version-semver": "6.2.0",
"description": "Qt Location",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
},
{
"name": "qtbase",
"default-features": false,
"features": [
"dbus"
],
"platform": "linux"
}
],
"features": {
"nmea": {
"description": "Build with nmea",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"network"
]
},
"qtserialport"
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

9
ports/qtlottie/portfile.cmake
View File

@ -3,8 +3,15 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

24
ports/qtlottie/vcpkg.json
View File

@ -1,22 +1,26 @@
{
"name": "qtlottie",
"version-semver": "6.1.3",
"version-semver": "6.2.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/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
},
"qtdeclarative",
"qttools"
],
"default-features": [
"default-features"
"default-features": false,
"features": [
"gui"
]
}
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

12
ports/qtmqtt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtmqtt",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -11,13 +11,5 @@
"network"
]
}
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
]
}

13
ports/qtmultimedia/fix_windows_header_include.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index 23e349e02..233a816d4 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -56,7 +56,7 @@
#include <qset.h>
#include <qaudio.h>
#include <qaudiodevice.h>
-#include <windows.h>
+#include <QtCore/qt_windows.h>
struct IMMDeviceEnumerator;

40
ports/qtmultimedia/portfile.cmake Normal file
View File

@ -0,0 +1,40 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES fix_windows_header_include.patch)
#Maybe TODO: ALSA + PulseAudio? (Missing Ports)
# 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)
# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio)
# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf)
# qt_configure_add_summary_section(NAME "Qt Multimedia")
# qt_configure_add_summary_entry(ARGS "alsa")
# qt_configure_add_summary_entry(ARGS "gstreamer_1_0")
# qt_configure_add_summary_entry(ARGS "linux_v4l")
# qt_configure_add_summary_entry(ARGS "pulseaudio")
# qt_configure_add_summary_entry(ARGS "mmrenderer")
# qt_configure_add_summary_entry(ARGS "avfoundation")
# qt_configure_add_summary_entry(ARGS "wmf")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets
"gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer
)
if("gstreamer" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'")
else()
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'")
endif()
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

49
ports/qtmultimedia/vcpkg.json Normal file
View File

@ -0,0 +1,49 @@
{
"name": "qtmultimedia",
"version-semver": "6.2.0",
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui",
"network"
]
}
],
"default-features": [
"widgets"
],
"features": {
"gstreamer": {
"description": "Build with gstreamer",
"dependencies": [
"angle",
"gstreamer"
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
},
"widgets": {
"description": "Build Multimedia Widgets",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"widgets"
]
}
]
}
}
}

12
ports/qtnetworkauth/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Network Authenticators; QtOAuth in particular",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -11,13 +11,5 @@
"network"
]
}
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
]
}

1
ports/qtopcua/portfile.cmake
View File

@ -10,6 +10,7 @@ FEATURES
"ns0idnames" FEATURE_ns0idnames
"ns0idgenerator" FEATURE_ns0idgenerator
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
if("open62541" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system

21
ports/qtopcua/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -10,8 +10,7 @@
"features": [
"network"
]
},
"qtdeclarative"
}
],
"default-features": [
"default-features",
@ -45,6 +44,22 @@
}
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
{
"name": "qtdeclarative",
"default-features": false
}
]
},
"uacpp": {
"description": "Unified Automation C++ SDK"
}

4
ports/qtquick3d/portfile.cmake
View File

@ -1,8 +1,6 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
# General features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
@ -17,7 +15,7 @@ else()
list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no)
endif()
set(TOOL_NAMES balsam meshdebug shadergen)
set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}

9
ports/qtquick3d/vcpkg.json
View File

@ -1,12 +1,15 @@
{
"name": "qtquick3d",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "A new module and API for defining 3D content in Qt Quick.",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"gui"
]
},
"qtdeclarative",
{
@ -14,6 +17,7 @@
"host": true,
"default-features": false
},
"qtquicktimeline",
"qtshadertools"
],
"default-features": [
@ -21,6 +25,7 @@
],
"features": {
"assimp": {
"$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay",
"description": "assimp",
"dependencies": [
"assimp"

12
ports/qtquickcontrols2/portfile.cmake
View File

@ -1,14 +1,2 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
#make sure your <vcpkg_root> path is really short! Otherwise the build will probably fail.
# or maybe try to switch the build to nmake.
#set(ENV{CMAKE_BUILD_PARALLEL_LEVEL} 1)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

18
ports/qtquickcontrols2/vcpkg.json
View File

@ -1,21 +1,9 @@
{
"name": "qtquickcontrols2",
"version-semver": "6.1.3",
"description": "Qt Quick Controls 2",
"version-semver": "6.2.0",
"description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
},
"qtdeclarative"
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
]
}

2
ports/qtquicktimeline/vcpkg.json
View File

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

18
ports/qtremoteobjects/portfile.cmake Normal file
View File

@ -0,0 +1,18 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
set(TOOL_NAMES repc)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

42
ports/qtremoteobjects/vcpkg.json Normal file
View File

@ -0,0 +1,42 @@
{
"name": "qtremoteobjects",
"version-semver": "6.2.0",
"description": "Qt distributed object system",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"network"
]
},
{
"name": "qtdeclarative",
"default-features": false
},
{
"name": "qtremoteobjects",
"host": true,
"default-features": false
}
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

8
ports/qtscxml/portfile.cmake
View File

@ -5,9 +5,15 @@ set(${PORT}_PATCHES)
set(TOOL_NAMES qscxmlc)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

25
ports/qtscxml/vcpkg.json
View File

@ -1,22 +1,31 @@
{
"name": "qtscxml",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"gui"
]
},
"qtdeclarative",
{
"name": "qtscxml",
"host": true,
"default-features": false
},
{
"name": "qttools",
"default-features": false
}
]
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

16
ports/qtsensors/portfile.cmake Normal file
View File

@ -0,0 +1,16 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

30
ports/qtsensors/vcpkg.json Normal file
View File

@ -0,0 +1,30 @@
{
"name": "qtsensors",
"version-semver": "6.2.0",
"description": "Qt Sensors",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"dbus"
]
},
{
"name": "qtconnectivity",
"default-features": false
}
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

18
ports/qtserialbus/portfile.cmake Normal file
View File

@ -0,0 +1,18 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(TOOL_NAMES
canbusutil
)
# Probably not worth the time to make it features:
# qt_configure_add_summary_entry(ARGS "socketcan") # only unix
# qt_configure_add_summary_entry(ARGS "socketcan_fd") # only unix
# qt_configure_add_summary_entry(ARGS "modbus-serialport")
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

32
ports/qtserialbus/vcpkg.json Normal file
View File

@ -0,0 +1,32 @@
{
"name": "qtserialbus",
"version-semver": "6.2.0",
"description": "Support for CAN and potentially other serial buses.",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"network"
]
},
{
"name": "qtserialbus",
"host": true,
"default-features": false
},
{
"name": "qtserialport",
"default-features": false
}
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
}
}
}

10
ports/qtserialport/portfile.cmake Normal file
View File

@ -0,0 +1,10 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

12
ports/qtserialport/vcpkg.json Normal file
View File

@ -0,0 +1,12 @@
{
"name": "qtserialport",
"version-semver": "6.2.0",
"description": "Qt Serial Port support",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
}
]
}

2
ports/qtshadertools/vcpkg.json
View File

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

2
ports/qtsvg/vcpkg.json
View File

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

70
ports/qttools/portfile.cmake
View File

@ -33,9 +33,15 @@ set(${PORT}_PATCHES )#fix_static_build.patch)
# General features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"assistant" FEATURE_assistant
"designer" FEATURE_designer
"linguist" FEATURE_linguist
INVERTED_FEATURES
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets
)
set(TOOL_NAMES
@ -67,14 +73,52 @@ elseif(VCPKG_TARGET_IS_OSX)
list(APPEND TOOL_NAMES macdeployqt)
endif()
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)
### Download third_party modules
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
FETCH_REF master
HEAD_REF master
)
# port 'litehtml' is not in vcpkg!
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH_LITEHTML
REPO litehtml/litehtml
REF db7f59d5886fd50f84d48720c79dc2e6152efa83
SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352
HEAD_REF master
)
##### qt_install_submodule
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_download_submodule(PATCHES ${${PORT}_PATCHES})
if(QT_UPDATE_VERSION)
return()
endif()
file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml")
file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml")
if(_qis_DISABLE_NINJA)
set(_opt DISABLE_NINJA)
endif()
qt_cmake_configure(${_opt}
OPTIONS ${FEATURE_OPTIONS}
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
vcpkg_install_cmake(ADD_BIN_TO_PATH)
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
qt_install_copyright("${SOURCE_PATH}")
##### qt_install_submodule
if(VCPKG_TARGET_IS_OSX)
set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app)
foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
@ -92,3 +136,9 @@ if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/wind
string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}")
file(WRITE "${configfile}" "${_contents}")
endif()
file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*")
list(LENGTH debug_dir debug_dir_elements)
if(debug_dir_elements EQUAL 0)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
endif()

48
ports/qttools/vcpkg.json
View File

@ -1,29 +1,63 @@
{
"name": "qttools",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"network"
]
"default-features": false
},
"qtdeclarative",
{
"name": "qttools",
"host": true,
"default-features": false
"default-features": false,
"features": [
"assistant",
"linguist"
]
}
],
"features": {
"assistant": {
"description": "Build Qt Assistant"
},
"designer": {
"description": "Build Qt Designer"
},
"linguist": {
"description": "Build Qt Linguist components",
"dependencies": [
{
"name": "qttools",
"default-features": false,
"features": [
"designer"
]
}
]
},
"qdoc": {
"description": "Build QDoc.",
"dependencies": [
"llvm"
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

10
ports/qttranslations/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qttranslations",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "Qt Translations",
"homepage": "https://www.qt.io/",
"dependencies": [
@ -8,7 +8,13 @@
"name": "qtbase",
"default-features": false
},
"qttools"
{
"name": "qttools",
"default-features": false,
"features": [
"linguist"
]
}
],
"default-features": [
"default-features"

20
ports/qtvirtualkeyboard/vcpkg.json
View File

@ -1,12 +1,24 @@
{
"name": "qtvirtualkeyboard",
"version-semver": "6.1.3",
"version-semver": "6.2.0",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"dependencies": [
"qtdeclarative",
"qtsvg",
"qttools"
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
},
{
"name": "qtdeclarative",
"default-features": false
},
{
"name": "qtsvg",
"default-features": false
}
],
"default-features": [
"default-features",

9
ports/qtwayland/portfile.cmake
View File

@ -9,9 +9,16 @@ set(${PORT}_PATCHES)
set(TOOL_NAMES qtwaylandscanner)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

25
ports/qtwayland/vcpkg.json
View File

@ -1,24 +1,27 @@
{
"name": "qtwayland",
"version-semver": "6.1.3",
"port-version": 2,
"version-semver": "6.2.0",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"supports": "!windows",
"dependencies": [
{
"name": "qtbase",
"default-features": false
},
"qtdeclarative",
"qtopcua"
],
"default-features": [
"default-features"
"default-features": false,
"features": [
"gui"
]
}
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

17
ports/qtwebchannel/portfile.cmake Normal file
View File

@ -0,0 +1,17 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

23
ports/qtwebchannel/vcpkg.json Normal file
View File

@ -0,0 +1,23 @@
{
"name": "qtwebchannel",
"version-semver": "6.2.0",
"description": "Qt WebChannel",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false
}
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

110
ports/qtwebengine/portfile.cmake Normal file
View File

@ -0,0 +1,110 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"proprietary-codecs" FEATURE_webengine-proprietary-codecs
"spellchecker" FEATURE_webengine-spellchecker
"geolocation" FEATURE_webengine-geolocation
"webchannel" FEATURE_webengine-webchannel
INVERTED_FEATURES
"geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning
"webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel
)
if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES)
list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-native-spellchecker=ON")
endif()
# webengine-extensions
# webengine-printing-and-pdf
# webengine-pepper-plugins
set(deactivated_features webengine-webrtc webengine-webrtc-pipewire webengine-v8-snapshot-support)
foreach(_feat IN LISTS deactivated_features)
list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF")
endforeach()
if(VCPKG_TARGET_IS_LINUX)
# qt_configure_add_summary_entry(ARGS "webengine-system-lcms2")
# qt_configure_add_summary_entry(ARGS "webengine-system-libpci")
# + ALSA and PULSEAUDIO
set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype)
foreach(_sys_lib IN LISTS system_libs)
list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-system-${_sys_lib}=ON")
endforeach()
endif()
vcpkg_find_acquire_program(FLEX)
vcpkg_find_acquire_program(BISON)
vcpkg_find_acquire_program(GPERF)
vcpkg_find_acquire_program(PYTHON2)
#vcpkg_find_acquire_program(GN) # Qt builds its own internal version
find_program(NODEJS NAMES node PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/node" "bin" NO_DEFAULT_PATHS)
find_program(NODEJS NAMES node)
if(NOT NODEJS)
message(FATAL_ERROR "node not found! Please install it via your system package manager!")
endif()
get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")
get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
endif()
if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}")
file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}")
endif()
endif()
### Download third_party modules
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE
URL git://code.qt.io/qt/qtwebengine-chromium.git
REF 202e34476e934633b3c2e4679a53c4b0847364a8
)
##### qt_install_submodule
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_download_submodule(PATCHES ${${PORT}_PATCHES})
if(QT_UPDATE_VERSION)
return()
endif()
if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium")
file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium")
endif()
if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn")
file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn")
endif()
qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS}
-DGPerf_EXECUTABLE=${GPERF}
-DBISON_EXECUTABLE=${BISON}
-DFLEX_EXECUTABLE=${FLEX}
#-DGn_EXECUTABLE=${GN}
-DPython2_EXECUTABLE=${PYTHON2}
-DNodejs_EXECUTABLE=${NODEJS}
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
vcpkg_install_cmake(ADD_BIN_TO_PATH)
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
qt_install_copyright("${SOURCE_PATH}")
##### qt_install_submodule

146
ports/qtwebengine/vcpkg.json Normal file
View File

@ -0,0 +1,146 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version-semver": "6.2.0",
"description": "Qt WebEngine",
"homepage": "https://www.qt.io/",
"supports": "!static & !((arm | x86) & windows)",
"dependencies": [
{
"name": "ffmpeg",
"platform": "!windows"
},
{
"name": "fontconfig",
"platform": "!windows"
},
{
"name": "freetype",
"platform": "!windows"
},
{
"name": "glib",
"platform": "!windows"
},
{
"name": "harfbuzz",
"platform": "!windows"
},
{
"name": "icu",
"platform": "!windows"
},
{
"name": "libevent",
"platform": "!windows"
},
{
"name": "libjpeg-turbo",
"platform": "!windows"
},
{
"name": "libpng",
"platform": "!windows"
},
{
"name": "libvpx",
"platform": "!windows"
},
{
"name": "libwebp",
"platform": "!windows"
},
{
"name": "libxml2",
"platform": "!windows"
},
{
"name": "minizip",
"platform": "!windows"
},
"opengl-registry",
{
"name": "opus",
"platform": "!windows"
},
{
"name": "protobuf",
"platform": "!windows"
},
{
"name": "qtbase",
"default-features": false,
"features": [
"gui",
"network",
"widgets"
]
},
{
"name": "qtdeclarative",
"default-features": false
},
{
"name": "qtdeclarative",
"default-features": false
},
{
"name": "qttools",
"default-features": false
},
{
"$comment": "Requires GN host tool build by the port itself! (special version check)",
"name": "qtwebengine",
"host": true,
"default-features": false
},
{
"name": "re2",
"platform": "!windows"
},
{
"name": "snappy",
"platform": "!windows"
},
{
"name": "vcpkg-tool-nodejs",
"host": true
},
{
"name": "zlib",
"platform": "!windows"
}
],
"default-features": [
"default-features"
],
"features": {
"default-features": {
"description": "Platform-dependent default features"
},
"geolocation": {
"description": "Build with Geolocation",
"dependencies": [
{
"name": "qtlocation",
"default-features": false
}
]
},
"proprietary-codecs": {
"description": "Enables the use of proprietary codecs such as h.264/h.265 and MP3."
},
"spellchecker": {
"description": "Provides a spellchecker"
},
"webchannel": {
"description": "Provides QtWebChannel integration",
"dependencies": [
{
"name": "qtwebchannel",
"default-features": false
}
]
}
}
}

17
ports/qtwebsockets/portfile.cmake Normal file
View File

@ -0,0 +1,17 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

26
ports/qtwebsockets/vcpkg.json Normal file
View File

@ -0,0 +1,26 @@
{
"name": "qtwebsockets",
"version-semver": "6.2.0",
"description": "Qt WebSockets",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"network"
]
}
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
}
}
}

19
ports/qtwebview/portfile.cmake Normal file
View File

@ -0,0 +1,19 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick
"webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

35
ports/qtwebview/vcpkg.json Normal file
View File

@ -0,0 +1,35 @@
{
"name": "qtwebview",
"version-semver": "6.2.0",
"description": "Qt Web View",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gui"
]
}
],
"features": {
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
},
"webengine": {
"description": "Build with Webengine",
"dependencies": [
{
"name": "qtwebengine",
"default-features": false
}
]
}
}
}

57
ports/vcpkg-tool-nodejs/portfile.cmake Normal file
View File

@ -0,0 +1,57 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(PROGNAME node)
set(PROG_VERSION 14.17.4)
set(BREW_PACKAGE_NAME "${PROGNAME}")
set(APT_PACKAGE_NAME "${PROGNAME}")
if(VCPKG_CROSSCOMPILING)
message(FATAL_ERROR "This is a host only port!")
endif()
set(BASE_URL "https://nodejs.org/dist/v${PROG_VERSION}/")
set(ARCHIVE "")
set(ARCHIVE_EXT "")
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^x86$|arm")
set(ARCHIVE "node-v${PROG_VERSION}-win-x86")
set(ARCHIVE_EXT ".zip")
set(HASH 82ea09a10f20ecab860b9e15b2cc72eec4a60ac5f20680f7846f37c5c1422d38d448cd7a71382cbb41101c1382412368bb74bf1a0bd7698f7ba882e022ae7304)
elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ARCHIVE "node-v${PROG_VERSION}-win-x64")
set(ARCHIVE_EXT ".zip")
set(HASH 9a067c9ac5abc8d6af756b9a5344beee552f877a54833bdfa3a88e694359831f4edc9fac9c2c29b2f02f859e79bfeb4b91735e70c02c9daddf3e82efbfcbe46c)
elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ARCHIVE "node-v${PROG_VERSION}-darwin-x64")
set(ARCHIVE_EXT ".tar.gz")
set(HASH 76575afb5711c6fbccd45ef319d6c3960d0363808a0703e7e9ed5c637fe19af63a8ff6eb08182df77c7620d50a42bf9fd324489466556a1b5895f0f2aebb8a5a)
elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ARCHIVE "node-v${PROG_VERSION}-linux-x64")
set(ARCHIVE_EXT ".tar.xz")
set(HASH 696af62f78147dc20e15364ba7fea6f707b0d5e3c9ae925975d64ec7dc90db4f27a3e5e90307a26bf48b05e0096ab34144d29cd9379b70b384cbd3144bf8cd85)
else()
message(FATAL_ERROR "Target not yet supported by '${PORT}'")
endif()
set(URL "${BASE_URL}${ARCHIVE}${ARCHIVE_EXT}")
message(STATUS "URL: '${URL}'")
vcpkg_download_distfile(ARCHIVE_PATH
URLS "${URL}"
SHA512 "${HASH}"
FILENAME "${ARCHIVE}${ARCHIVE_EXT}"
#ALWAYS_REDOWNLOAD
#SKIP_SHA512
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'")
vcpkg_execute_in_download_mode(
COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}"
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
)
file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true)
message(STATUS "Files and Folders: '${folders}'")
file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node")

5
ports/vcpkg-tool-nodejs/vcpkg.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "vcpkg-tool-nodejs",
"version-semver": "14.17.4",
"supports": "native"
}

7
scripts/ci.baseline.txt
View File

@ -1249,13 +1249,6 @@ qhull:arm-uwp=fail
qpid-proton:arm-uwp=fail
qpid-proton:x64-uwp=fail
qpid-proton:x64-windows-static=fail
# Skip ports not available in Qt 6.1.0 (for Qt 6.2)
qt6betablock:x86-windows=skip
qt6betablock:x64-windows=skip
qt6betablock:x64-windows-static=skip
qt6betablock:x64-windows-static-md=skip
qt6betablock:x64-linux=skip
qt6betablock:x64-osx=skip
qt5-base:arm64-windows=fail
# Skip deprecated Qt module
# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)

98
versions/baseline.json
View File

@ -5357,7 +5357,7 @@
"port-version": 1
},
"qt": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qt-advanced-docking-system": {
@ -5537,7 +5537,7 @@
"port-version": 1
},
"qt5compat": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qt6betablock": {
@ -5545,96 +5545,140 @@
"port-version": 0
},
"qtactiveqt": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtbase": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtcharts": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtcoap": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtconnectivity": {
"baseline": "6.2.0",
"port-version": 0
},
"qtdatavis3d": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtdeclarative": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtdoc": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtimageformats": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtkeychain": {
"baseline": "0.11.1",
"port-version": 1
},
"qtlocation": {
"baseline": "6.2.0",
"port-version": 0
},
"qtlottie": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtmqtt": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtmultimedia": {
"baseline": "6.2.0",
"port-version": 0
},
"qtnetworkauth": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtopcua": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtquick3d": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtquickcontrols2": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtquicktimeline": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtremoteobjects": {
"baseline": "6.2.0",
"port-version": 0
},
"qtscxml": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtsensors": {
"baseline": "6.2.0",
"port-version": 0
},
"qtserialbus": {
"baseline": "6.2.0",
"port-version": 0
},
"qtserialport": {
"baseline": "6.2.0",
"port-version": 0
},
"qtshadertools": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtsvg": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qttools": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qttranslations": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtvirtualkeyboard": {
"baseline": "6.1.3",
"baseline": "6.2.0",
"port-version": 0
},
"qtwayland": {
"baseline": "6.1.3",
"port-version": 2
"baseline": "6.2.0",
"port-version": 0
},
"qtwebchannel": {
"baseline": "6.2.0",
"port-version": 0
},
"qtwebengine": {
"baseline": "6.2.0",
"port-version": 0
},
"qtwebsockets": {
"baseline": "6.2.0",
"port-version": 0
},
"qtwebview": {
"baseline": "6.2.0",
"port-version": 0
},
"quadtree": {
"baseline": "2020-04-13",
@ -6876,6 +6920,10 @@
"baseline": "2021-04-02",
"port-version": 1
},
"vcpkg-tool-nodejs": {
"baseline": "14.17.4",
"port-version": 0
},
"vectorclass": {
"baseline": "2.00.01",
"port-version": 1

5
versions/q-/qt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "420d2198ead04223b9c2901f9c1078b6f956cf44",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "7af9212716c1c55de883178c890121a7d804cc48",
"version-semver": "6.1.3",

5
versions/q-/qt5compat.json
View File

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

5
versions/q-/qtactiveqt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c7d57c70efabceaca7d833b441ad986c4eebb09b",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f",
"version-semver": "6.1.3",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9850138b57bf2122ee9e5063c76944754f4dbf63",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a",
"version-semver": "6.1.3",

5
versions/q-/qtcharts.json
View File

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

5
versions/q-/qtcoap.json
View File

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

9
versions/q-/qtconnectivity.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "c646047361feb006e3d5ab1d29412de763c4c505",
"version-semver": "6.2.0",
"port-version": 0
}
]
}

5
versions/q-/qtdatavis3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "80e7cb3d96c9ecf079d94b39d06d1eb19fbe6bdc",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "30c282e8438df69e77b4e2a6935addb778bc761c",
"version-semver": "6.1.3",

5
versions/q-/qtdeclarative.json
View File

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

5
versions/q-/qtdoc.json
View File

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

5
versions/q-/qtimageformats.json
View File

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

9
versions/q-/qtlocation.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "ce4d2a217a74a82545c0ec6f5dcb343bedad3f6a",
"version-semver": "6.2.0",
"port-version": 0
}
]
}

5
versions/q-/qtlottie.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a1ac4e53ead69723b671e153edd918c818380668",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "4c9e0cf0663bfb60c9f99f44302e0934c2e325bb",
"version-semver": "6.1.3",

5
versions/q-/qtmqtt.json
View File

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

9
versions/q-/qtmultimedia.json Normal file
View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3",
"version-semver": "6.2.0",
"port-version": 0
}
]
}

5
versions/q-/qtnetworkauth.json
View File

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

5
versions/q-/qtopcua.json
View File

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

5
versions/q-/qtquick3d.json
View File

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

5
versions/q-/qtquickcontrols2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cc6552504db6a9b651a65d98fbeb232152b7a8fe",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "cdf33560d3def651acf48341ea6dc0447c270c5b",
"version-semver": "6.1.3",

5
versions/q-/qtquicktimeline.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "34391c636963d95d64bb987d2edc1f75cbefa322",
"version-semver": "6.2.0",
"port-version": 0
},
{
"git-tree": "664a251eb795ac206c32b87e39060db32922fe4d",
"version-semver": "6.1.3",

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