From 8a373681b2d714193effbce5ad90b2ee69b08530 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 5 Jan 2013 23:22:03 +0100 Subject: [PATCH] qt5: ifdef two Q_DECLARE_METATYPE invocations out, for some reason they fail with Qt5 --- .../database/DatabaseCommand_LoadAllSortedPlaylists.h | 4 ++++ src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h index 80d1e3337..38d4e2692 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h @@ -61,5 +61,9 @@ private: DatabaseCommand_LoadAllPlaylists::SortAscDesc m_sortAscDesc; }; +//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 + #endif // DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H diff --git a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h index fdc987bd5..57ae3598a 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h @@ -142,6 +142,9 @@ 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 #endif // DATABASECOMMAND_LOADSOCIALACTIONS_H