Use new lastfm5/ include dir for Qt5

CMakeModules/FindLibLastFm.cmake

@@ -14,7 +14,7 @@ endif()
 # Include dir
 find_path(LIBLASTFM_INCLUDE_DIR
   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
-  NAMES lastfm/Track.h
+  NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
   PATHS ${KDE4_INCLUDE_DIR}
 )
 

src/libtomahawk/accounts/lastfm/LastFmConfig.cpp

@@ -29,10 +29,17 @@
 #include "utils/Closure.h"
 #include "utils/NetworkAccessManager.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ws.h>
+#include <lastfm5/User.h>
+#include <lastfm5/XmlQuery.h>
+#include <lastfm5/Track.h>
+#else
 #include <lastfm/ws.h>
 #include <lastfm/User.h>
 #include <lastfm/XmlQuery.h>
 #include <lastfm/Track.h>
+#endif
 
 using namespace Tomahawk::Accounts;
 

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp

@@ -34,8 +34,13 @@
 #include "TomahawkSettings.h"
 #include "utils/NetworkAccessManager.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ws.h>
+#include <lastfm5/XmlQuery.h>
+#else
 #include <lastfm/ws.h>
 #include <lastfm/XmlQuery.h>
+#endif
 
 using namespace Tomahawk::Accounts;
 using namespace Tomahawk::InfoSystem;

src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h

@@ -24,9 +24,15 @@
 #include "infosystem/InfoSystemWorker.h"
 #include "DllMacro.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/Track.h>
+#include <lastfm5/Audioscrobbler.h>
+#include <lastfm5/ScrobblePoint.h>
+#else
 #include <lastfm/Track.h>
 #include <lastfm/Audioscrobbler.h>
 #include <lastfm/ScrobblePoint.h>
+#endif
 
 #include <QObject>
 

src/libtomahawk/utils/TomahawkUtils.cpp

@@ -32,7 +32,11 @@
 #include "Track.h"
 
 #ifdef LIBLASTFM_FOUND
+    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    #include <lastfm5/ws.h>
+    #else
     #include <lastfm/ws.h>
+    #endif
 #endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

src/tomahawk/Scrobbler.h

@@ -20,10 +20,15 @@
 #ifndef TOMAHAWK_SCROBBLER_H
 #define TOMAHAWK_SCROBBLER_H
 
-#include "lastfm/ScrobblePoint.h"
 #include "Result.h"
 #include "infosystem/InfoSystem.h"
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ScrobblePoint.h>
+#else
+#include <lastfm/ScrobblePoint.h>
+#endif
 #include <QObject>
 
 /**

src/tomahawk/TomahawkApp.h

@@ -64,7 +64,11 @@ namespace Tomahawk
 }
 
 #ifdef LIBLASTFM_FOUND
+    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    #include <lastfm5/NetworkAccessManager.h>
+    #else
     #include <lastfm/NetworkAccessManager.h>
+    #endif
     #include "Scrobbler.h"
 #endif