diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2024-02-07 02:42:37 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-05 19:18:12 +0000 |
| commit | 0cdaac7d353e938c5f0b1cc452e82e59dee0e438 (patch) | |
| tree | 6a7f896d9dd283cf51274eb29d6a7434ffff2595 /src/3rdparty/libdbus/dbus/dbus-init-win.h | |
| parent | 9e9c8ca9527a3a7ae3d96e94bf3bd2ce2f872727 (diff) | |
Add libdbus to 3rdparty for Windows/macOS
On startup, we check if a libdbus-1 is provided by the system. If not
we try to load our build instead, which will then be picked up by
QtDBus later on.
This enables us to use appman-controller in the QtCreator integration
even on Windows and macOS.
Change-Id: Ib832198ffd9c9e08e14d3c35cdcb4dff17f3b656
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ea49063b02733e3ec8caaf39a610fb70d24d5b0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libdbus/dbus/dbus-init-win.h')
| -rw-r--r-- | src/3rdparty/libdbus/dbus/dbus-init-win.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/3rdparty/libdbus/dbus/dbus-init-win.h b/src/3rdparty/libdbus/dbus/dbus-init-win.h new file mode 100644 index 00000000..8a9de8f7 --- /dev/null +++ b/src/3rdparty/libdbus/dbus/dbus-init-win.h @@ -0,0 +1,17 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* + * Copyright © 2013 Intel Corporation + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * + * Do not include other private headers in this one, particularly + * dbus-sysdeps.h: it gets included into C++ code which is not + * compatible with our use of <stdatomic.h>. + */ + +#ifndef DBUS_INIT_WIN_H +#define DBUS_INIT_WIN_H + +void _dbus_threads_windows_init_global (void); +void _dbus_threads_windows_ensure_ctor_linked (void); + +#endif |