mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 01:54:07 +02:00
Code Issues Releases Wiki Activity

Qt5 sometimes defines Metatypes by itself, don't define them twice

Browse Source
This commit is contained in:
Uwe L. Korn
2013-07-26 12:22:23 +02:00
parent 852ef9d339
commit 46572cc5d1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/Playlist.h
View File

@@ -287,6 +287,10 @@ private:
} }
Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::Playlist > ) Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::Playlist > )
Q_DECLARE_METATYPE( QList< QSharedPointer< Tomahawk::Query > > )
#if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
// Qt5 automatically generated this Metatype
Q_DECLARE_METATYPE( QList< QSharedPointer< Tomahawk::Query > > )
#endif
#endif // PLAYLIST_H #endif // PLAYLIST_H

5
src/libtomahawk/database/DatabaseCommand_GenericSelect.h
View File

@@ -87,6 +87,9 @@ private:
} }
Q_DECLARE_METATYPE(QList<QStringList>); #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
// Qt5 automatically generated this Metatype
Q_DECLARE_METATYPE(QList<QStringList>)
#endif
#endif // DATABASECOMMAND_GENERICSELECT_H #endif // DATABASECOMMAND_GENERICSELECT_H