aboutsummaryrefslogtreecommitdiff
path: root/ports/qtscxml
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-09-30 22:03:56 +0200
committerGitHub <noreply@github.com>2021-09-30 13:03:56 -0700
commit35bfef708400cf882efb3e4df93045e0a06c9c23 (patch)
treef507c664794ece69707f33aef7fc627d96acbed7 /ports/qtscxml
parent8ad33ead9075cd8d6d357e0b870ba8d501efe35c (diff)
downloadvcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.tar.gz
vcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.zip
[Qt 6.2] Update Qt6 to 6.2 (#18687)
* [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
Diffstat (limited to 'ports/qtscxml')
-rw-r--r--ports/qtscxml/portfile.cmake8
-rw-r--r--ports/qtscxml/vcpkg.json25
2 files changed, 24 insertions, 9 deletions
diff --git a/ports/qtscxml/portfile.cmake b/ports/qtscxml/portfile.cmake
index daa6b663e..1215ca019 100644
--- a/ports/qtscxml/portfile.cmake
+++ b/ports/qtscxml/portfile.cmake
@@ -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
)
diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json
index 72af5b012..8e52fe46e 100644
--- a/ports/qtscxml/vcpkg.json
+++ b/ports/qtscxml/vcpkg.json
@@ -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
+ }
+ ]
+ }
+ }
}