diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
| commit | 840dab97ee4bd68dcf75cfd2edd5e58c38040ae1 (patch) | |
| tree | 04270ec3cad3bfb3d2cb48f6c6455b49aee02b53 /src/dbus/qdbus_symbols_p.h | |
| parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
| parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
| download | Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.zip Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.gz Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.bz2 | |
Merge remote branch 'origin/master' into mobility-master
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'src/dbus/qdbus_symbols_p.h')
| -rw-r--r-- | src/dbus/qdbus_symbols_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index 9ea05b2..7168e05 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -196,6 +196,8 @@ DEFINEFUNC(void , dbus_free, (void *memory), (memory), ) /* dbus-message.h */ DEFINEFUNC(DBusMessage* , dbus_message_copy, (const DBusMessage *message), (message), return) +DEFINEFUNC(dbus_bool_t , dbus_message_get_auto_start, (DBusMessage *message), + (message), return) DEFINEFUNC(const char* , dbus_message_get_error_name, (DBusMessage *message), (message), return) DEFINEFUNC(const char* , dbus_message_get_interface, (DBusMessage *message), @@ -268,6 +270,9 @@ DEFINEFUNC(DBusMessage* , dbus_message_new_signal, (const char *path, (path, interface, name), return) DEFINEFUNC(DBusMessage* , dbus_message_ref, (DBusMessage *message), (message), return) +DEFINEFUNC(void , dbus_message_set_auto_start, (DBusMessage *message, + dbus_bool_t auto_start), + (message, auto_start), return) DEFINEFUNC(dbus_bool_t , dbus_message_set_destination, (DBusMessage *message, const char *destination), (message, destination), return) |