qt5: that should have ended up in the latest commit, too late for git

for me

src/libtomahawk/CMakeLists.txt

@@ -154,12 +154,20 @@ set( libGuiSources
     widgets/searchlineedit/SearchLineEdit.cpp
 )
 
-IF(QCA2_FOUND)
+if(QCA2_FOUND)
     set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp )
     set( libGuiHeaders ${libGuiHeaders} utils/GroovesharkParser.h )
-ENDIF(QCA2_FOUND)
+endif()
 
-set( libSources
+if(UNIX AND NOT APPLE)
+    if(BUILD_GUI AND X11_FOUND)
+        include_directories( ${THIRDPARTY_DIR}/libqnetwm )
+        list(APPEND libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp)
+        list(APPEND LINK_LIBRARIES ${X11_LIBRARIES})
+    endif()
+endif()
+
+list(APPEND libSources
     TomahawkSettings.cpp
     SourceList.cpp
     Pipeline.cpp

src/libtomahawk/TomahawkPlugin.h

@@ -1,3 +1,5 @@
+#include <QtPlugin>
+
 #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
     #if defined(Q_EXPORT_PLUGIN)
         #undef Q_EXPORT_PLUGIN

src/libtomahawk/utils/TomahawkUtilsGui.cpp

@@ -39,6 +39,8 @@
 #include <QStyleOption>
 #include <QDesktopServices>
 
+//FIXME: Qt5: this doesnt fail because Q_WS_X11 is deprecated
+//TODO: change to Q_OS_X11 and fix errors
 #ifdef Q_WS_X11
     #include <QtGui/QX11Info>
     #include <libqnetwm/netwm.h>