Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Don't assume qdbus is in PATH #676

Closed
wants to merge 0 commits into from
Closed

Conversation

krop
Copy link
Contributor

@krop krop commented Apr 9, 2024

We'll use ECM's ecm_query_qt macro to find where Qt executables are installed.

Fixes: #675

Copy link
Member

@Shatur Shatur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! I didn't know about this.

CMakeLists.txt Outdated
@@ -74,7 +74,7 @@ if(WIN32)
add_subdirectory(src/qgittag)
endif()

find_package(Qt5 REQUIRED COMPONENTS Widgets LinguistTools Concurrent)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets LinguistTools Concurrent)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why Core is required? If you require Widgets, Core is automatically included.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because Qt5::qmake is defined in Qt5CoreConfigExtras.cmake

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume it should work becaue Widgets already imports Core. I tried it on my machine and it works.

@Shatur
Copy link
Member

Shatur commented Apr 9, 2024

Looks like build on old Ubuntu fails. Maybe we could provide a temporary callback if ECM version is older?

@krop
Copy link
Contributor Author

krop commented Apr 9, 2024

Looks like build on old Ubuntu fails. Maybe we could provide a temporary callback if ECM version is older?

No need, ECM also has a solution for this case

@Shatur
Copy link
Member

Shatur commented Apr 9, 2024

Great!

Could you also try to remove Core from requirements? I think it should work without it.

@krop
Copy link
Contributor Author

krop commented Apr 9, 2024

I'm not fond of relying on transitive dependencies. A build system should require what it uses.

@Shatur
Copy link
Member

Shatur commented Apr 9, 2024

I prefer to keep PRs minimal and change other things only if it's absolutely necessary.

@victorhck
Copy link
Contributor

I prefer to keep PRs minimal and change other things only if it's absolutely necessary.

Since I'm not a developer, I'm a bit lost with all this stuff. So I want to ask if this PR can be merged?
As a workaround I'll change the .desktop file to point to qdbus6.
Thanks for your work!
Greetings

CMakeLists.txt Outdated Show resolved Hide resolved
@Shatur
Copy link
Member

Shatur commented Apr 12, 2024

Tried to pushed the changes, but for some reason GitHub closed the PR. I suspect it's because it was done from master.
I will reopen.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

qdbus not found with Ctrl+Alt+e shortcut
3 participants