diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-05-19 11:56:24 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-05-26 07:20:35 +0000 |
| commit | bd1f5b268a1095ec6a4856cef46bc8550a8a8af8 (patch) | |
| tree | 92b5070846667a1a0e163590e71c35913e241c6c /dist/changes-1.39-19980616 | |
| parent | 75af24a2d121ab56c5b60524bf1d7f2af1613025 (diff) | |
Make sure we don't call dbus_connection_can_send_type on too old libdbus
This function was introduced alongside the support for Unix file
descriptors, so it's a good indicator of whether Unix FDs are
supported. Ever since dbus_minimal_p.h, however, DBUS_TYPE_UNIX_FD may
be defined even if the system libs don't support it.
In order to fix this issue, I had to fix what was apparently a merge
conflict resolution mistake and remove the #ifdef around the test. Doing
the latter is a good idea due to moc being unable to find <dbus/dbus.h>.
This was tested with both linked and dynamically-loaded libdbus-1.
Task-number: QTBUG-46199
Change-Id: I66a35ce5f88941f29aa6ffff13dfb4b5438613a3
Reviewed-by: Jani Vähäkangas <jani.vahakangas@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'dist/changes-1.39-19980616')
0 files changed, 0 insertions, 0 deletions