Skip to content

[qttools] fix qdbusviewer #29153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 3 commits into from
Jan 27, 2023
Merged

[qttools] fix qdbusviewer #29153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8b95f6
fix building qdbusviewer
reitowo Jan 24, 2023
d653cec
Update ports/qttools/portfile.cmake
reitowo Jan 25, 2023
02d3606
Update qttools.json
reitowo Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ports/qttools/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}")
Expand Down
14 changes: 14 additions & 0 deletions ports/qttools/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qttools",
"version": "6.4.2",
"port-version": 1,
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down Expand Up @@ -59,6 +60,19 @@
}
]
},
"qdbus": {
"description": "Build qdbusviewer",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"dbus",
"widgets"
]
}
]
},
"qdoc": {
"description": "Build QDoc.",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6510,7 +6510,7 @@
},
"qttools": {
"baseline": "6.4.2",
"port-version": 0
"port-version": 1
},
"qttranslations": {
"baseline": "6.4.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qttools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0dc19ef06a3e54a475cedeacd80987aea5ac4477",
"version": "6.4.2",
"port-version": 1
},
{
"git-tree": "3a84f9dabc349f703b9e4c2d8e673971fb07a426",
"version": "6.4.2",
Expand Down