From 93bc06615d0931869e7698dac9da13ddef781362 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Tue, 23 Feb 2016 12:21:44 +0100
Subject: [PATCH] Fix Zeroconf with recent Qt5

---
 src/libtomahawk/network/Servent.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index 7b7ab0cec..90aea4a2f 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -1371,7 +1371,10 @@ Servent::isIPWhitelisted( QHostAddress ip )
         }
     }
 
-#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
+// Did something change in Qt 5? In Qt 5.5 Zeroconf does not work with this code ifdef'ed out
+// @xhochy can you shed some light on this?
+
+// #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
     // Qt4 cannot cope correctly with IPv4 addresses mapped into the IPv6
     // address space
     if ( ip.protocol() == QAbstractSocket::IPv6Protocol )
@@ -1397,7 +1400,7 @@ Servent::isIPWhitelisted( QHostAddress ip )
             return isIPWhitelisted( addr );
         }
     }
-#endif
+// #endif
 
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure";
     return false;