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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/libkdepim
From:       Allen Winter <winter () kde ! org>
Date:       2010-02-19 15:34:04
Message-ID: 1266593644.394476.8811.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1092823 by winterz:

bring over the kincidencechooser test program from the 4.4 branch.
MERGE: none


 M  +2 -1      calendardiffalgo.h  
 M  +2 -1      htmldiffalgodisplay.h  
 M  +4 -2      tests/Makefile.am  
 A             tests/testkincidencechooser.cpp   \
branches/KDE/4.4/kdepim/libkdepim/tests/testkincidencechooser.cpp#1086299 [License: \
LGPL (v2+)]


--- branches/kdepim/enterprise/kdepim/libkdepim/calendardiffalgo.h #1092822:1092823
@@ -22,9 +22,10 @@
 #ifndef KPIM_CALENDARDIFFALGO_H
 #define KPIM_CALENDARDIFFALGO_H
 
+#include "diffalgo.h"
+
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
-#include <libkdepim/diffalgo.h>
 
 namespace KPIM {
 
--- branches/kdepim/enterprise/kdepim/libkdepim/htmldiffalgodisplay.h \
#1092822:1092823 @@ -22,8 +22,9 @@
 #ifndef KPIM_HTMLDIFFALGODISPLAY_H
 #define KPIM_HTMLDIFFALGODISPLAY_H
 
+#include "diffalgo.h"
+
 #include <ktextbrowser.h>
-#include <libkdepim/diffalgo.h>
 #include <kdepimmacros.h>
 
 namespace KPIM {
--- branches/kdepim/enterprise/kdepim/libkdepim/tests/Makefile.am #1092822:1092823
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libemailfunctions \
$(all_includes) +AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim \
-I$(top_srcdir)/libemailfunctions $(all_includes)  AM_LDFLAGS = $(all_libraries) \
$(KDE_RPATH)  LDADD = ../libkdepim.la $(LIB_KDECORE)
 
@@ -8,7 +8,8 @@
                  testutf7encoder \
                  test_kregexp \
                  testdateedit \
-                 testlinklocator
+                 testlinklocator \
+                 testkincidencechooser
 
 # disabled because of X dependency
 #                 testdistrlist
@@ -22,6 +23,7 @@
 testdateedit_SOURCES = testdateedit.cpp
 testlinklocator_SOURCES = testlinklocator.cpp
 #testdistrlist_SOURCES = testdistrlist.cpp
+testkincidencechooser_SOURCES = testkincidencechooser.cpp
 
 #TESTS = testdistrlist
 


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