mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

Fix Zeroconf with recent Qt5

Browse Source
This commit is contained in:
Dominik Schmidt
2016-02-23 12:21:44 +01:00
parent 3bcf854a4f
commit 93bc06615d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/network/Servent.cpp
View File

@@ -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 // Qt4 cannot cope correctly with IPv4 addresses mapped into the IPv6
// address space // address space
if ( ip.protocol() == QAbstractSocket::IPv6Protocol ) if ( ip.protocol() == QAbstractSocket::IPv6Protocol )
@@ -1397,7 +1400,7 @@ Servent::isIPWhitelisted( QHostAddress ip )
return isIPWhitelisted( addr ); return isIPWhitelisted( addr );
} }
} }
#endif // #endif
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure"; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure";
return false; return false;