From 212ef9faba7e4f0f83c1983de3a6c827d5dc8b8f Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 13 Jan 2020 01:46:47 +0000
Subject: [PATCH] remove redundant DBUS_TYPE_UNIX_FD checks

DBUS_TYPE_UNIX_FD and DBUS_TYPE_UNIX_FD_AS_STRING are available since
v1.2.16 and v1.5.12 is required now

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/dbus/qdbusargument_p.h   | 5 -----
 src/dbus/qdbusintegrator.cpp | 4 ----
 src/dbus/qdbusmetatype.cpp   | 5 -----
 3 files changed, 14 deletions(-)

diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index d8ba6985e..0e4335038 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -50,11 +50,6 @@
 
 #include <dbus/dbus.h>
 
-#ifndef DBUS_TYPE_UNIX_FD
-# define DBUS_TYPE_UNIX_FD int('h')
-# define DBUS_TYPE_UNIX_FD_AS_STRING "h"
-#endif
-
 QT_BEGIN_NAMESPACE
 
 class QDBusMarshaller;
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 31d0d4aaf..2b4800d84 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1649,10 +1649,6 @@ void QDBusConnectionPrivate::setPeer(DBusConnection *c, const QDBusErrorInternal
 static QDBusConnection::ConnectionCapabilities connectionCapabilies(DBusConnection *connection)
 {
     QDBusConnection::ConnectionCapabilities result = 0;
-
-#ifndef DBUS_TYPE_UNIX_FD
-# define DBUS_TYPE_UNIX_FD int('h')
-#endif
     if (dbus_connection_can_send_type(connection, DBUS_TYPE_UNIX_FD))
         result |= QDBusConnection::UnixFileDescriptorPassing;
 
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index 0c675e556..49bbbff73 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -44,11 +44,6 @@
 #include <dbus/dbus.h>
 #include <string.h>
 
-#ifndef DBUS_TYPE_UNIX_FD
-# define DBUS_TYPE_UNIX_FD int('h')
-# define DBUS_TYPE_UNIX_FD_AS_STRING "h"
-#endif
-
 Q_DECLARE_METATYPE(QList<bool>)
 Q_DECLARE_METATYPE(QList<short>)
 Q_DECLARE_METATYPE(QList<ushort>)
-- 
2.11.0