1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00

Merge pull request #106175 from akien-mga/linux-build-no-dbus

Linux: Fix build with `dbus=no` or `threads=no`
This commit is contained in:
Rémi Verschelde
2025-06-09 00:44:12 +02:00
3 changed files with 8 additions and 4 deletions

View File

@@ -3691,6 +3691,7 @@ Key DisplayServerX11::keyboard_get_label_from_physical(Key p_keycode) const {
}
bool DisplayServerX11::color_picker(const Callable &p_callback) {
#ifdef DBUS_ENABLED
WindowID window_id = last_focused_window;
if (!windows.has(window_id)) {
@@ -3699,6 +3700,9 @@ bool DisplayServerX11::color_picker(const Callable &p_callback) {
String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
return portal_desktop->color_picker(xid, p_callback);
#else
return false;
#endif
}
DisplayServerX11::Property DisplayServerX11::_read_property(Display *p_display, Window p_window, Atom p_property) {