diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/dbus/qdbus_symbols_p.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -751,7 +751,7 @@ QMakeVar add styles "mac fusion windows" unset QTDIR # the minimum version of libdbus-1 that we require: -MIN_DBUS_1_VERSION=0.93 +MIN_DBUS_1_VERSION=1.2 # initalize internal variables CFG_CONFIGURE_EXIT_ON_ERROR=yes 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) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index b6611c7517..839fe55901 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -244,7 +244,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) QDBusConnectionPrivate *d = static_cast<QDBusConnectionPrivate *>(data); int flags = q_dbus_watch_get_flags(watch); - int fd = q_dbus_watch_get_fd(watch); + int fd = q_dbus_watch_get_unix_fd(watch); if (QCoreApplication::instance() && QThread::currentThread() == d->thread()) { return qDBusRealAddWatch(d, watch, flags, fd); @@ -295,7 +295,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data) //qDebug("remove watch"); QDBusConnectionPrivate *d = static_cast<QDBusConnectionPrivate *>(data); - int fd = q_dbus_watch_get_fd(watch); + int fd = q_dbus_watch_get_unix_fd(watch); QDBusWatchAndTimeoutLocker locker(RemoveWatchAction, d); QDBusConnectionPrivate::WatcherHash::iterator i = d->watchers.find(fd); @@ -326,7 +326,7 @@ static void qDBusToggleWatch(DBusWatch *watch, void *data) Q_ASSERT(data); QDBusConnectionPrivate *d = static_cast<QDBusConnectionPrivate *>(data); - int fd = q_dbus_watch_get_fd(watch); + int fd = q_dbus_watch_get_unix_fd(watch); if (QCoreApplication::instance() && QThread::currentThread() == d->thread()) { qDBusRealToggleWatch(d, watch, fd); |