[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-mediacenter/frameworks] libs: Merge branch 'master' into frameworks
From:       Bhushan Shah <bhush94 () gmail ! com>
Date:       2014-05-01 4:14:18
Message-ID: E1WfiO2-0003to-7w () scm ! kde ! org
[Download RAW message or body]

Git commit 8ee2639244a95824e0f8d5878b462e75abf7ae9f by Bhushan Shah.
Committed on 01/05/2014 at 09:43.
Pushed by bshah into branch 'frameworks'.

Merge branch 'master' into frameworks

Conflicts:
	libs/CMakeLists.txt
	libs/mediacenter/CMakeLists.txt
	libs/mediacenter/test/lastfmimagefetchertest.cpp
	libs/mediacenter/test/medialibrarytest.cpp
	libs/mediacenter/test/singletonfactorytest.cpp
	libs/test/CMakeLists.txt

M  +0    -3    libs/CMakeLists.txt
M  +21   -37   libs/mediacenter/CMakeLists.txt
M  +1    -1    libs/mediacenter/pmcimagecache.h
M  +11   -1    libs/mediacenter/pmcmetadatamodel.cpp
M  +1    -0    libs/mediacenter/pmcmetadatamodel.h
M  +0    -0    libs/mediacenter/test/fakemediavalidator.h
M  +0    -0    libs/mediacenter/test/lastfmimagefetchertest.cpp
M  +0    -0    libs/mediacenter/test/lastfmimagefetchertest.h
M  +0    -3    libs/mediacenter/test/mediacentertest.cpp
M  +9    -22   libs/mediacenter/test/medialibrarytest.cpp
M  +0    -3    libs/mediacenter/test/medialibrarytest.h
M  +0    -0    libs/mediacenter/test/singletonfactorytest.cpp

http://commits.kde.org/plasma-mediacenter/8ee2639244a95824e0f8d5878b462e75abf7ae9f

diff --cc libs/CMakeLists.txt
index eda2632,a0a0f72..660846d
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@@ -1,4 -1,5 +1,1 @@@
- remove_definitions(-DQT_NO_STL)
- 
  add_subdirectory(mediacenter)
- add_subdirectory(test)
 -
 -if (DEFINED NO_LINK_TO_PLASMA)
 -    add_subdirectory(plasmaadapter)
 -endif (NO_LINK_TO_PLASMA)
diff --cc libs/mediacenter/CMakeLists.txt
index 0a39662,2dbec83..c75bf26
--- a/libs/mediacenter/CMakeLists.txt
+++ b/libs/mediacenter/CMakeLists.txt
@@@ -77,15 -42,12 +42,13 @@@ add_library(plasmamediacenter SHARE
  )
  
  target_link_libraries(plasmamediacenter
 -    ${QT_QTDECLARATIVE_LIBRARIES}
 -    ${KDE4_KDECORE_LIBRARY}
 -    ${KDE4_KIO_LIBS}
 -    ${KDE4_SOLID_LIBS}
 +    Qt5::Core
 +    Qt5::Declarative
 +    KF5::Solid
 +    KF5::GuiAddons
 +    KF5::CoreAddons
 +    KF5::KDELibs4Support
-     ${Boost_LIBRARIES}
-     ${QxOrm_LIBRARIES}
      ${TAGLIB_LIBRARIES}
 -    ${NEPOMUK_CORE_LIBRARY}
  )
  
  set_target_properties(plasmamediacenter PROPERTIES VERSION 1.2 SOVERSION 1.2)
@@@ -107,4 -70,26 +70,25 @@@ install(FILES ${plasmamediacenter_HDRS
  install(FILES data/servicetypes/pmc_browsingbackend.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR})  install(FILES data/servicetypes/pmc_mediasource.desktop \
DESTINATION ${SERVICETYPES_INSTALL_DIR})  
 +add_subdirectory(plugin)
+ ##############################          TESTS           \
                ##############################
 -if (KDE4_BUILD_TESTS)
 -    SET(QT_USE_QTMAIN TRUE)
 -    SET(QT_USE_QTTEST TRUE)
++if (KDE_BUILD_TESTS)
+ 
+     function(pmc_test TESTNAME)
 -        kde4_add_executable(${TESTNAME} ${plasmamediacenter_SRCS} \
test/${TESTNAME}.cpp test/fakemediavalidator.cpp) ++        \
add_executable(${TESTNAME} ${plasmamediacenter_SRCS} test/${TESTNAME}.cpp \
test/fakemediavalidator.cpp) +         add_test(pmc-libs-${TESTNAME} ${TESTNAME})
+         target_link_libraries(${TESTNAME}
 -            ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}
 -            ${QT_QTTEST_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} \
                ${QT_QTXML_LIBRARIES}  ${QT_QTDECLARATIVE_LIBRARIES}
 -            ${TAGLIB_LIBRARIES}
++            Qt5::Core
++            Qt5::Declarative
++            Qt5::Test
+         )
+     endfunction(pmc_test)
+ 
+     pmc_test(medialibrarytest)
+     pmc_test(singletonfactorytest)
+     pmc_test(lastfmimagefetchertest)
+     pmc_test(pmcmediatest)
+     pmc_test(mediatest)
+     pmc_test(mediacentertest)
 -endif (KDE4_BUILD_TESTS)
++endif (KDE_BUILD_TESTS)
+ ######################################################################################
                
diff --cc libs/mediacenter/pmcimagecache.h
index abc35c6,631d5bd..130f4f2
--- a/libs/mediacenter/pmcimagecache.h
+++ b/libs/mediacenter/pmcimagecache.h
@@@ -22,11 -22,11 +22,11 @@@
  #include <QtDeclarative/QDeclarativeImageProvider>
  #include <QtCore/QHash>
  
 -#include "mediacenter_export.h"
 +#include <KImageCache>
  
 -class KImageCache;
 +#include "mediacenter_export.h"
  
- class MEDIACENTER_EXPORT PmcImageCache : public QObject
+ class PmcImageCache : public QObject
  {
      Q_OBJECT
  public:
diff --cc libs/mediacenter/test/medialibrarytest.cpp
index ebd4760,08af239..648d525
--- a/libs/mediacenter/test/medialibrarytest.cpp
+++ b/libs/mediacenter/test/medialibrarytest.cpp
@@@ -20,7 -20,16 +20,15 @@@
  #include "fakemediavalidator.h"
  #include "testhelpers.h"
  
- static const char* DB_FILENAME = "plasma-mediacenter.sqlite";
+ #include <mediacenter/medialibrary.h>
+ #include <mediacenter/mediacenter.h>
+ 
+ #include <mediacenter/pmcmedia.h>
+ #include <mediacenter/pmcalbum.h>
+ #include <mediacenter/pmcartist.h>
+ 
 -#include <qtest_kde.h>
++#include <qtest.h>
+ 
 -QTEST_KDEMAIN(MediaLibraryTest, NoGUI);
  
  void MediaLibraryTest::initTestCase()
  {


[prev in list] [next in list] [prev in thread] [next in thread]