libechonest is suffixed by 5 for Qt5

CMakeModules/FindEchonest.cmake

@@ -6,9 +6,14 @@
 # ECHONEST_FOUND, whether libechonest was found
 
 FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest)
 
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
+if( TOMAHAWK_QT5 )
+    set(LIBECHONEST_SUFFIX "5")
+endif()
+
+PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
+
+FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
     HINTS
         ${PC_ECHONEST_INCLUDEDIR}
         ${PC_ECHONEST_INCLUDE_DIRS}
@@ -16,7 +21,7 @@ FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
         ${KDE4_INCLUDE_DIR}
 )
 
-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest
+FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest${LIBECHONEST_SUFFIX}
     HINTS
         ${PC_ECHONEST_LIBDIR}
         ${PC_ECHONEST_LIBRARY_DIRS}

src/infoplugins/generic/echonest/EchonestPlugin.cpp

@@ -23,7 +23,12 @@
 #include "utils/Logger.h"
 #include "utils/NetworkAccessManager.h"
 
-#include <echonest/ArtistTypes.h>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/ArtistTypes.h>
+#else
+    #include <echonest5/ArtistTypes.h>
+#endif
+
 
 #include <QNetworkConfiguration>
 

src/infoplugins/generic/echonest/EchonestPlugin.h

@@ -24,7 +24,12 @@
 
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "echonest/Artist.h"
+
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Artist.h>
+#else
+    #include <echonest5/Artist.h>
+#endif
 
 #include <QObject>
 

src/libtomahawk/EchonestCatalogSynchronizer.cpp

@@ -18,9 +18,6 @@
 
 #include "EchonestCatalogSynchronizer.h"
 
-#include <echonest/CatalogUpdateEntry.h>
-#include <echonest/Config.h>
-
 #include "collection/Collection.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
@@ -35,8 +32,13 @@
 #include "TomahawkSettings.h"
 #include "Track.h"
 
-#include <echonest/CatalogUpdateEntry.h>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-#include <echonest/Config.h>
+    #include <echonest/CatalogUpdateEntry.h>
+    #include <echonest/Config.h>
+#else
+    #include <echonest5/CatalogUpdateEntry.h>
+    #include <echonest5/Config.h>
+#endif
 
 using namespace Tomahawk;
 

src/libtomahawk/EchonestCatalogSynchronizer.h

@@ -23,7 +23,11 @@
 #include "Query.h"
 #include "database/DatabaseCommand_TrackAttributes.h"
 
-#include <echonest/Catalog.h>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Catalog.h>
+#else
+    #include <echonest5/Catalog.h>
+#endif
 
 #include <QObject>
 #include <QQueue>

src/libtomahawk/GlobalActionManager.cpp

@@ -25,7 +25,6 @@
 
 #include "audio/AudioEngine.h"
 #include "database/LocalCollection.h"
-#include "echonest/Playlist.h"
 #include "playlist/dynamic/GeneratorInterface.h"
 #include "playlist/PlaylistTemplate.h"
 #include "playlist/PlaylistView.h"
@@ -53,6 +52,12 @@
 #include <QApplication>
 #include <QClipboard>
 
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Playlist.h>
+#else
+    #include <echonest5/Playlist.h>
+#endif
+
 
 GlobalActionManager* GlobalActionManager::s_instance = 0;
 

src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp

@@ -25,8 +25,6 @@
 #include "utils/Logger.h"
 #include "SourceList.h"
 
-#include <echonest/Playlist.h>
-
 #include <QComboBox>
 #include <QLineEdit>
 #include <QLabel>

src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h

@@ -21,11 +21,15 @@
 
 #include "playlist/dynamic/DynamicControl.h"
 
-#include <echonest/Playlist.h>
-
 #include <QTimer>
 #include <QPointer>
 
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Playlist.h>
+#else
+    #include <echonest5/Playlist.h>
+#endif
+
 namespace Tomahawk
 {
 

src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h

@@ -20,7 +20,6 @@
 #define ECHONEST_GENERATOR_H
 
 #include <stdexcept>
-#include <echonest/Playlist.h>
 
 #include "playlist/dynamic/GeneratorInterface.h"
 #include "playlist/dynamic/GeneratorFactory.h"
@@ -29,6 +28,12 @@
 
 #include "DllMacro.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Playlist.h>
+#else
+    #include <echonest5/Playlist.h>
+#endif
+
 namespace Tomahawk
 {
 

src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp

@@ -24,7 +24,11 @@
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
-#include <echonest/Playlist.h>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Playlist.h>
+#else
+    #include <echonest5/Playlist.h>
+#endif
 
 #include <QPaintEvent>
 #include <QHBoxLayout>

src/tomahawk/sourcetree/items/CategoryItems.cpp

@@ -21,8 +21,6 @@
 
 #include <QMimeData>
 
-#include <echonest/Playlist.h>
-
 #include "DropJob.h"
 #include "TomahawkApp.h"
 #include "ViewManager.h"
@@ -36,6 +34,12 @@
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+    #include <echonest/Playlist.h>
+#else
+    #include <echonest5/Playlist.h>
+#endif
+
 using namespace Tomahawk;