mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 23:26:40 +02:00
Code Issues Releases Wiki Activity

Use new echonest5 include dir for Qt5

Browse Source
This commit is contained in:
Dominik Schmidt
2015-02-06 22:48:54 +01:00
parent d7177e30cb
commit 778b8ee180
10 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/FindEchonest.cmake
View File

@@ -13,7 +13,7 @@ endif()
PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX}) PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
HINTS HINTS
${PC_ECHONEST_INCLUDEDIR} ${PC_ECHONEST_INCLUDEDIR}
${PC_ECHONEST_INCLUDE_DIRS} ${PC_ECHONEST_INCLUDE_DIRS}

4
src/infoplugins/generic/echonest/EchonestPlugin.cpp
View File

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

4
src/infoplugins/generic/echonest/EchonestPlugin.h
View File

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

5
src/libtomahawk/EchonestCatalogSynchronizer.cpp
View File

@@ -33,8 +33,13 @@
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "Track.h" #include "Track.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <echonest5/CatalogUpdateEntry.h>
#include <echonest5/Config.h>
#else
#include <echonest/CatalogUpdateEntry.h> #include <echonest/CatalogUpdateEntry.h>
#include <echonest/Config.h> #include <echonest/Config.h>
#endif
using namespace Tomahawk; using namespace Tomahawk;

4
src/libtomahawk/EchonestCatalogSynchronizer.h
View File

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

6
src/libtomahawk/GlobalActionManager.cpp
View File

@@ -61,8 +61,12 @@
#include <QClipboard> #include <QClipboard>
#include <QMessageBox> #include <QMessageBox>
#include <echonest/Playlist.h>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <echonest5/Playlist.h>
#else
#include <echonest/Playlist.h>
#endif
GlobalActionManager* GlobalActionManager::s_instance = 0; GlobalActionManager* GlobalActionManager::s_instance = 0;

4
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
View File

@@ -24,7 +24,11 @@
#include <QTimer> #include <QTimer>
#include <QPointer> #include <QPointer>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <echonest5/Playlist.h>
#else
#include <echonest/Playlist.h> #include <echonest/Playlist.h>
#endif
namespace Tomahawk namespace Tomahawk
{ {

5
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
View File

@@ -28,7 +28,12 @@
#include "DllMacro.h" #include "DllMacro.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <echonest5/Playlist.h>
#else
#include <echonest/Playlist.h> #include <echonest/Playlist.h>
#endif
namespace Tomahawk namespace Tomahawk
{ {

4
src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
View File

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

4
src/tomahawk/sourcetree/items/CategoryItems.cpp
View File

@@ -33,7 +33,11 @@
#include "utils/ImageRegistry.h" #include "utils/ImageRegistry.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <echonest5/Playlist.h>
#else
#include <echonest/Playlist.h> #include <echonest/Playlist.h>
#endif
using namespace Tomahawk; using namespace Tomahawk;