From ac9c135521da550ec785ac2923519e95c8559f33 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Tue, 3 Sep 2013 14:57:19 +0200
Subject: [PATCH] Fix build

---
 src/libtomahawk/network/Servent.cpp | 13 +++----------
 src/libtomahawk/network/Servent.h   |  7 +++----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index ddb0589b9..815eed8f0 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -575,18 +575,11 @@ Servent::handleSipInfo( const Tomahawk::peerinfo_ptr& peerInfo )
 
 
 void
-Servent::incomingConnection( int sd )
-{
 #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    Q_UNUSED( sd );
-    Q_ASSERT( false );
-#else
-    incomingConnection( (qintptr) sd );
-#endif
-}
-
-void
 Servent::incomingConnection( qintptr sd )
+#else
+Servent::incomingConnection( int sd )
+#endif
 {
     Q_ASSERT( this->thread() == QThread::currentThread() );
 
diff --git a/src/libtomahawk/network/Servent.h b/src/libtomahawk/network/Servent.h
index 2a1cf1883..cf7845d50 100644
--- a/src/libtomahawk/network/Servent.h
+++ b/src/libtomahawk/network/Servent.h
@@ -150,12 +150,11 @@ signals:
     void ready();
 
 protected:
-// Would be nice to ifdef this, but we would need CMake 2.8.11 for that as a requirement
-// #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
     virtual void incomingConnection( qintptr sd );
-// #else
+#else
     virtual void incomingConnection( int sd );
-// #endif
+#endif
 
 public slots:
     void setExternalAddress( QHostAddress ha, unsigned int port );