From 9625bc801b18b8fa35ae6b49ab9dae3007a8965c Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 1 Jul 2012 16:37:46 +0200 Subject: [PATCH] testcomit for qtdeclarative --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 1 + src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp | 2 +- src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e9a0831..08b5e43cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ IF( NOT BUILD_GUI ) MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" ) ELSE() 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() IF( BUILD_GUI AND UNIX AND NOT APPLE ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe218bc8d..bd1e595a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -211,6 +211,7 @@ TARGET_LINK_LIBRARIES( tomahawk ${QXTWEB_LIBRARIES} ${QJSON_LIBRARIES} ${TAGLIB_LIBRARIES} + ${QT_QTDECLARATIVE_LIBRARY} ) IF( APPLE ) diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index e834d88fb..39ddb877d 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -44,7 +44,7 @@ using namespace Tomahawk; ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget* parent ) - : QWidget( parent ) + : QDeclarativeView( parent ) , ui( new Ui::ArtistInfoWidget ) , m_artist( artist ) { diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h index a3b91f2a8..7175ea64e 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h @@ -36,6 +36,8 @@ #include "PlaylistInterface.h" #include "ViewPage.h" +#include "QDeclarativeView" + #include "DllMacro.h" class PlayableModel; @@ -48,7 +50,7 @@ namespace Ui class MetaArtistInfoInterface; -class DLLEXPORT ArtistInfoWidget : public QWidget, public Tomahawk::ViewPage +class DLLEXPORT ArtistInfoWidget : public QDeclarativeView, public Tomahawk::ViewPage { Q_OBJECT