diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-29 16:09:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-29 17:55:20 +0200 |
| commit | b894a8def5d9107663e4968d2d395f5ef3059125 (patch) | |
| tree | f894c50c9e5cbdd7ec102291eb94979977ce5b37 /src/dbus/dbus_minimal_p.h | |
| parent | d2304a28ca657634253af26ad803c7f292e6f4cc (diff) | |
| parent | 002112e80516a29efbb6cef721d74c5fc39fc19d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
mkspecs/features/qt_common.prf
src/gui/text/qzip.cpp
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/windows/array.h
src/testlib/qtestcase.cpp
src/widgets/dialogs/qfilesystemmodel.h
Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
Diffstat (limited to 'src/dbus/dbus_minimal_p.h')
| -rw-r--r-- | src/dbus/dbus_minimal_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h index 8b40742e0c..b52b0153e4 100644 --- a/src/dbus/dbus_minimal_p.h +++ b/src/dbus/dbus_minimal_p.h @@ -105,9 +105,11 @@ typedef dbus_uint32_t dbus_bool_t; /* dbus-shared.h */ #define DBUS_SERVICE_DBUS "org.freedesktop.DBus" #define DBUS_PATH_DBUS "/org/freedesktop/DBus" +#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local" #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" #define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" #define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" +#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local" #define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */ #define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */ |