1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00

Merge branch 'qmlng' of github.com:tomahawk-player/tomahawk into qmlng

Conflicts:
	src/libtomahawk/playlist/PlayableModel.cpp
	src/tomahawk/sourcetree/SourcesModel.cpp
This commit is contained in:
Michael Zanetti
2013-07-19 00:45:22 +02:00

View File

@@ -326,6 +326,11 @@ PlayableModel::data( const QModelIndex& index, int role ) const
switch ( role ) switch ( role )
{ {
case IsPlayingRole:
{
return entry->isPlaying();
break;
}
case Qt::TextAlignmentRole: case Qt::TextAlignmentRole:
{ {
return QVariant( columnAlignment( index.column() ) ); return QVariant( columnAlignment( index.column() ) );