summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
commit038b18b2df1da40baab30d62171766048a948095 (patch)
treeba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /kword/mailmerge
parentd0baf2961c379b31587c6542625018c6177474d0 (diff)
downloadkoffice-038b18b2df1da40baab30d62171766048a948095.tar.gz
koffice-038b18b2df1da40baab30d62171766048a948095.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge')
-rw-r--r--kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 14222bf0..2f0c1a73 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -23,7 +23,7 @@
#include <klineedit.h>
#include <kdebug.h>
#include <tqlayout.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kpushbutton.h>
#include <klineeditdlg.h>
#include <kiconloader.h>