diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 0525885a72a5c9..411c367a6a1f38 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -37,6 +37,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "assistant" FEATURE_assistant "designer" FEATURE_designer "linguist" FEATURE_linguist + "qdbus" FEATURE_qdbus "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml @@ -90,7 +91,11 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} ) if(VCPKG_TARGET_IS_OSX) - set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app) + set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app) + if (FEATURE_qdbus) + message(STATUS "Built qdbusviewer") + list(APPEND OSX_APP_FOLDERS qdbusviewer.app) + endif() foreach(_appfolder IN LISTS OSX_APP_FOLDERS) message(STATUS "Moving: ${_appfolder}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 239c14671128bd..3d116caaaa997e 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qttools", "version": "6.4.2", + "port-version": 1, "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, @@ -59,6 +60,19 @@ } ] }, + "qdbus": { + "description": "Build qdbusviewer", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus", + "widgets" + ] + } + ] + }, "qdoc": { "description": "Build QDoc.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 58ff5e49b08b37..799ff33e6fbd58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6510,7 +6510,7 @@ }, "qttools": { "baseline": "6.4.2", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.4.2", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 4b5d09f58dbecd..c357aa3d8837eb 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dc19ef06a3e54a475cedeacd80987aea5ac4477", + "version": "6.4.2", + "port-version": 1 + }, { "git-tree": "3a84f9dabc349f703b9e4c2d8e673971fb07a426", "version": "6.4.2",