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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/libakonadi
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2008-03-21 9:54:47
Message-ID: 1206093287.317030.11506.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 788288 by tokoe:

Merged components with libakonadi


 M  +10 -8     CMakeLists.txt  
 A             agentinstanceview.cpp   components/agentinstanceview.cpp#788161 \
[License: LGPL (v2+)]  A             agentinstanceview.h   \
components/agentinstanceview.h#788161 [License: LGPL (v2+)]  A             \
agenttypeview.cpp   components/agenttypeview.cpp#788161 [License: LGPL (v2+)]  A      \
agenttypeview.h   components/agenttypeview.h#788161 [License: LGPL (v2+)]  A          \
collectioncombobox.cpp   components/collectioncombobox.cpp#788161 [License: LGPL \
(v2+)]  A             collectioncombobox.h   components/collectioncombobox.h#788161 \
[License: LGPL (v2+)]  D             components (directory)  
 M  +16 -0     tests/CMakeLists.txt  
 A             tests/agentinstanceviewtest.cpp   \
components/tests/agentinstanceviewtest.cpp#788161 [License: LGPL (v2+)]  A            \
tests/agentinstanceviewtest.h   components/tests/agentinstanceviewtest.h#788161 \
[License: LGPL (v2+)]  A             tests/agenttypeviewtest.cpp   \
components/tests/agenttypeviewtest.cpp#788161 [License: LGPL (v2+)]  A             \
tests/agenttypeviewtest.h   components/tests/agenttypeviewtest.h#788161 [License: \
LGPL (v2+)]


--- trunk/KDE/kdepim/akonadi/libakonadi/CMakeLists.txt #788287:788288
@@ -1,6 +1,5 @@
 
 add_subdirectory( tests )
-add_subdirectory( components )
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/
@@ -29,29 +28,32 @@
 # libakonadi
 
 set( akonadi_LIB_SRC
-	agentinstancemodel.cpp
 	agentbase.cpp
+	agentfilterproxymodel.cpp
 	agentinstancecreatejob.cpp
+	agentinstancemodel.cpp
+	agentinstanceview.cpp
 	agentmanager.cpp
 	agenttypemodel.cpp
-	agentfilterproxymodel.cpp
+	agenttypeview.cpp
 	cachepolicy.cpp
 	cachepolicypage.cpp
 	changerecorder.cpp
 	collection.cpp
 	collectionattribute.cpp
 	collectionattributefactory.cpp
+  collectioncombobox.cpp
+	collectioncopyjob.cpp
 	collectioncreatejob.cpp
-	collectioncopyjob.cpp
 	collectiondeletejob.cpp
+	collectionfilterproxymodel.cpp
+	collectiongeneralpropertiespage.cpp
 	collectionlistjob.cpp
 	collectionmodel.cpp
-	collectionfilterproxymodel.cpp
 	collectionmodifyjob.cpp
 	collectionpathresolver.cpp
 	collectionpropertiesdialog.cpp
 	collectionpropertiespage.cpp
-	collectiongeneralpropertiespage.cpp
 	collectionrightsattribute.cpp
 	collectionselectjob.cpp
 	collectionstatus.cpp
@@ -90,9 +92,9 @@
 	session.cpp
 	standardactionmanager.cpp
 	subscriptionjob.cpp
+	subscriptionchangeproxymodel.cpp
+	subscriptiondialog.cpp
 	subscriptionmodel.cpp
-	subscriptiondialog.cpp
-	subscriptionchangeproxymodel.cpp
 	transactionjobs.cpp
 	xdgbasedirs.cpp
 )
--- trunk/KDE/kdepim/akonadi/libakonadi/tests/CMakeLists.txt #788287:788288
@@ -55,3 +55,19 @@
 add_akonadi_test(transactiontest.cpp)
 add_akonadi_test(itemcopytest.cpp)
 add_akonadi_test(collectioncopytest.cpp)
+
+########### next target ###############
+
+set(agentinstanceviewtest_SRCS agentinstanceviewtest.cpp )
+
+kde4_add_executable(agentinstanceviewtest TEST  ${agentinstanceviewtest_SRCS})
+
+target_link_libraries(agentinstanceviewtest akonadicomponents ${KDE4_KDECORE_LIBS})
+
+########### next target ###############
+
+set(agenttypeviewtest_SRCS agenttypeviewtest.cpp )
+
+kde4_add_executable(agenttypeviewtest TEST  ${agenttypeviewtest_SRCS})
+
+target_link_libraries(agenttypeviewtest akonadicomponents ${KDE4_KDECORE_LIBS})


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