path: root/src/dbus/qdbus_symbols_p.h
diff options
authorThiago Macieira <>2013-02-25 10:27:19 -0800
committerThe Qt Project <>2013-02-27 07:09:03 +0100
commitf92e844b2b741d7d72a64052bea57de5aa04c3a7 (patch)
tree9e37a8301cdda2fccbac47a1e40b57720c24cc6b /src/dbus/qdbus_symbols_p.h
parent996db96d5eb4927a130605e8c1820d7e1b303191 (diff)
Stop using function deprecated in D-Bus 1.2 (raise minimum version)
The dbus_watch_get_fd function was deprecated in D-Bus 1.2 (technically, in 1.1.1, but that was a development release) because it had a bad name. Sockets on Windows have file descriptors, but they are not shared from the same pool as the CRT library's file descriptors. This commit raises the minimum required version of D-Bus to 1.2. This is the first requirement raise since this code was introduced in 2006. For some reason, the D-Bus 1.2.0 release seems to be missing, but 1.2.1 was released on 04-Apr-2008. That's ancient enough for all distributions Qt 5 is supposed to run on. Change-Id: Ia6bbc137fffbb27c77290ed3e32d3380f0ae3c54 Reviewed-by: Lorn Potter <>
Diffstat (limited to 'src/dbus/qdbus_symbols_p.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index c1e36b0175..9e81bac30e 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -176,7 +176,7 @@ DEFINEFUNC(dbus_bool_t , dbus_timeout_handle, (DBusTimeout *timeout),
DEFINEFUNC(dbus_bool_t , dbus_watch_get_enabled, (DBusWatch *watch),
(watch), return)
-DEFINEFUNC(int , dbus_watch_get_fd, (DBusWatch *watch),
+DEFINEFUNC(int , dbus_watch_get_unix_fd, (DBusWatch *watch),
(watch), return)
DEFINEFUNC(unsigned int , dbus_watch_get_flags, (DBusWatch *watch),
(watch), return)