diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-18 16:27:35 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 02:43:05 +0200 |
commit | 0510fc149e0c6b955ee9b93917e72ee378369197 (patch) | |
tree | 9bc6a7e57a477db79efc3bcf1123881ebb1d6c09 /src/dbus/qdbus_symbols_p.h | |
parent | 221bd941ff255947ce7c78d08b1f9705e3d437be (diff) |
Make QtDBus work again with D-Bus 1.0 and 1.1
The dbus_get_version function was introduced in 1.2, so we'd need to
detect pre-1.2 by the absence of the function. But if we're going to
detect the presence or absence of any function, we might as well do it
on dbus_connection_can_send_type, which is the function we wanted anyway.
Change-Id: I6e17a3a8f1382c6a489490084f6e3f61aa5a1947
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/dbus/qdbus_symbols_p.h')
-rw-r--r-- | src/dbus/qdbus_symbols_p.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index a6e58e9148..f51728b47b 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -297,10 +297,6 @@ DEFINEFUNC(void , dbus_message_unref, (DBusMessage *message), (message), ) /* dbus-misc.h */ -DEFINEFUNC(void , dbus_get_version , (int *major_version_p, - int *minor_version_p, - int *micro_version_p), - (major_version_p, minor_version_p, micro_version_p), ) DEFINEFUNC(char* , dbus_get_local_machine_id , (void), (), return) @@ -363,14 +359,6 @@ DEFINEFUNC(void , dbus_server_unref, (DBusServer *server), /* dbus-thread.h */ DEFINEFUNC(dbus_bool_t , dbus_threads_init_default, (), (), return) - -/* D-Bus 1.4 symbols */ -#if !defined(QT_LINKED_LIBDBUS) || (DBUS_VERSION >= 0x010400) -DEFINEFUNC(dbus_bool_t , dbus_connection_can_send_type , (DBusConnection *connection, - int type), - (connection, type), return) -#endif - QT_END_NAMESPACE #endif // QT_NO_DBUS |