From 6f116fadb698c4e2a113a5e1e7117d7cef8b6b2d Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 5 Jan 2013 23:37:54 +0100 Subject: [PATCH] qt5: ifdeffing didn't work, needs to be commented out --- .../database/DatabaseCommand_LoadAllSortedPlaylists.h | 4 +--- src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h index 38d4e2692..83b82b980 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h @@ -62,8 +62,6 @@ private: }; //FIXME: Qt5: this fails with Qt5, is it needed at all? It compiles fine without in Qt4 as well -#if ! QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) -Q_DECLARE_METATYPE(QList) -#endif +// Q_DECLARE_METATYPE(QList) #endif // DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H diff --git a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h index 57ae3598a..ecc1c2ebd 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h @@ -143,8 +143,6 @@ private: }; //FIXME: Qt5: this fails with Qt5, is it needed at all? It compiles fine without in Qt4 as well -#if ! QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) -Q_DECLARE_METATYPE( DatabaseCommand_LoadSocialActions::TrackActions ) -#endif +// Q_DECLARE_METATYPE( DatabaseCommand_LoadSocialActions::TrackActions ) #endif // DATABASECOMMAND_LOADSOCIALACTIONS_H