summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:34 -0600
commitadafb126df16b9357494a47fcec20171ad6c8644 (patch)
treed842e4f2b20a477cc0f622cddca9fee4a98db82f /kmail
parent29d4a9cebb53f0220f7cf63f95ca8cbfd0f28793 (diff)
parentedc8fc84751a8eb968a9b8c4c75530c8ccb7523d (diff)
downloadtdepim-adafb126df16b9357494a47fcec20171ad6c8644.tar.gz
tdepim-adafb126df16b9357494a47fcec20171ad6c8644.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
Diffstat (limited to 'kmail')
-rw-r--r--kmail/tests/Makefile.am2
-rw-r--r--kmail/tests/mimelibtests.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am
index f8bc6ce49..2d492283b 100644
--- a/kmail/tests/Makefile.am
+++ b/kmail/tests/Makefile.am
@@ -1,5 +1,5 @@
INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
-AM_CPPFLAGS = -DKDESRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
METASOURCES = AUTO
check_LTLIBRARIES = kunittest_storagelayermodule.la \
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index b152fdcf6..6f4cf1896 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -73,10 +73,10 @@ void MimeLibTester::setUp()
{
// This multipart-mixed mail has a part that starts without headers;
// the newline after the (empty) headers must be preserved.
- mMultipartMixedMail = readFile( KDESRCDIR "/multipartmixed.mbox" );
+ mMultipartMixedMail = readFile( TDESRCDIR "/multipartmixed.mbox" );
// This is the full signed mail which was simplified to above.
// Kept around in case we want to do anything else with a signed mail later :)
- mSignedMail = readFile( KDESRCDIR "/signedmail.mbox" );
+ mSignedMail = readFile( TDESRCDIR "/signedmail.mbox" );
}
void MimeLibTester::tearDown()