From ca3258ea22d052238eebb80a4ef1a2458f552ac0 Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 5 Aug 2025 02:27:06 +0300 Subject: [PATCH] [qt5-tools] enable qdoc feature also in debug (#46709) --- ports/qt5-tools/portfile.cmake | 12 +++++------- ports/qt5-tools/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-tools.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 87ebf99e44..c15e540e39 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,21 +1,19 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -vcpkg_list(SET OPTIONS_RELEASE) +vcpkg_list(SET OPTIONS) if("qdoc" IN_LIST FEATURES) set(ENV{LLVM_INSTALL_DIR} "${CURRENT_INSTALLED_DIR}") - vcpkg_list(APPEND OPTIONS_RELEASE -feature-qdoc) + vcpkg_list(APPEND OPTIONS -feature-qdoc) else() - vcpkg_list(APPEND OPTIONS_RELEASE -no-feature-qdoc) + vcpkg_list(APPEND OPTIONS -no-feature-qdoc) endif() qt_submodule_installation( PATCHES fix-pkgconfig-qt5uiplugin-not-found.patch libclang.patch - BUILD_OPTIONS_RELEASE - ${OPTIONS_RELEASE} - BUILD_OPTIONS_DEBUG - -no-feature-qdoc + BUILD_OPTIONS + ${OPTIONS} ) if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index cd82fdd4f0..13ddcf101d 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-tools", "version": "5.15.17", + "port-version": 1, "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f0fb66951a..e56ce8f505 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7886,7 +7886,7 @@ }, "qt5-tools": { "baseline": "5.15.17", - "port-version": 0 + "port-version": 1 }, "qt5-translations": { "baseline": "5.15.17", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index b121ad3a02..627253506d 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7d073db6022de57bf6c0e24e53514e1f0624abf", + "version": "5.15.17", + "port-version": 1 + }, { "git-tree": "718839eb66c9ec8b6fae3bc50cfc263e63f874c2", "version": "5.15.17",