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

testcomit for qtdeclarative

Browse Source
This commit is contained in:
Michael Zanetti
2012-07-01 16:37:46 +02:00
parent bbec1dfbbe
commit 5c47ae96ab
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -88,7 +88,7 @@ IF( NOT BUILD_GUI )
MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" ) MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
ELSE() ELSE()
MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" ) MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" ) LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtDeclarative" )
ENDIF() ENDIF()
IF( BUILD_GUI AND UNIX AND NOT APPLE ) IF( BUILD_GUI AND UNIX AND NOT APPLE )

1
src/CMakeLists.txt
View File

@@ -204,6 +204,7 @@ TARGET_LINK_LIBRARIES( tomahawk
${QXTWEB_LIBRARIES} ${QXTWEB_LIBRARIES}
${QJSON_LIBRARIES} ${QJSON_LIBRARIES}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY}
) )
IF( APPLE ) IF( APPLE )

2
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@@ -43,7 +43,7 @@ using namespace Tomahawk;
ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* parent ) ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* parent )
: QWidget( parent ) : QDeclarativeView( parent )
, ui( new Ui::ArtistInfoWidget ) , ui( new Ui::ArtistInfoWidget )
, m_artist( artist ) , m_artist( artist )
{ {

4
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h
View File

@@ -36,6 +36,8 @@
#include "PlaylistInterface.h" #include "PlaylistInterface.h"
#include "ViewPage.h" #include "ViewPage.h"
#include "QDeclarativeView"
#include "DllMacro.h" #include "DllMacro.h"
class PlayableModel; class PlayableModel;
@@ -48,7 +50,7 @@ namespace Ui
class MetaPlaylistInterface; class MetaPlaylistInterface;
class DLLEXPORT ArtistInfoWidget : public QWidget, public Tomahawk::ViewPage class DLLEXPORT ArtistInfoWidget : public QDeclarativeView, public Tomahawk::ViewPage
{ {
Q_OBJECT Q_OBJECT