summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2015-09-19 21:15:23 +0200
committerVolker Krause <[email protected]>2015-09-19 21:15:23 +0200
commita1914275c2405a5837fe15366964a11736079727 (patch)
tree9ae2c8a9749b12c683e8ea40240e0a2873580cfb
parent52beb31ce231af4aa9b13a2511cd3c045093f3d6 (diff)
compile
-rw-r--r--mailcommon/src/filter/filteractions/filteractionforward.cpp2
-rw-r--r--messagecomposer/autotests/messagefactorytest.cpp3
-rw-r--r--messageviewer/src/settings/globalsettings_messageviewer.kcfgc2
-rw-r--r--templateparser/src/settings/customtemplates_kfg.kcfgc2
-rw-r--r--templateparser/src/settings/globalsettings_templateparser.kcfgc2
5 files changed, 5 insertions, 6 deletions
diff --git a/mailcommon/src/filter/filteractions/filteractionforward.cpp b/mailcommon/src/filter/filteractions/filteractionforward.cpp
index fe65350..6aead8b 100644
--- a/mailcommon/src/filter/filteractions/filteractionforward.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionforward.cpp
@@ -30,7 +30,7 @@
#include <PimCommon/EmailAddressRequester>
#include <MessageCore/StringUtil>
#include <TemplateParser/CustomTemplates>
-#include <templateparser/customtemplates_kfg.h>
+#include <customtemplates_kfg.h>
#include <KLocalizedString>
#include <KLineEdit>
diff --git a/messagecomposer/autotests/messagefactorytest.cpp b/messagecomposer/autotests/messagefactorytest.cpp
index b68a087..90a7c7d 100644
--- a/messagecomposer/autotests/messagefactorytest.cpp
+++ b/messagecomposer/autotests/messagefactorytest.cpp
@@ -50,8 +50,7 @@
#include <KCharsets>
#include <QDir>
#include <QLocale>
-#include "templateparser/globalsettings_templateparser.h"
-#include "templateparser/templateparser_export.h"
+#include "globalsettings_templateparser.h"
using namespace MessageComposer;
using namespace MessageComposer;
diff --git a/messageviewer/src/settings/globalsettings_messageviewer.kcfgc b/messageviewer/src/settings/globalsettings_messageviewer.kcfgc
index 4635f0e..d7386b3 100644
--- a/messageviewer/src/settings/globalsettings_messageviewer.kcfgc
+++ b/messageviewer/src/settings/globalsettings_messageviewer.kcfgc
@@ -6,5 +6,5 @@ Mutators=true
Singleton=true
ItemAccessors=true
SetUserTexts=true
-IncludeFiles=qapplication.h,messageviewer/messageviewer_export.h,messageviewer/objecttreeparser.h,messageviewer_debug.h
+IncludeFiles=qapplication.h,messageviewer_export.h,messageviewer/objecttreeparser.h,messageviewer_debug.h
CategoryLoggingName=MESSAGEVIEWER_LOG
diff --git a/templateparser/src/settings/customtemplates_kfg.kcfgc b/templateparser/src/settings/customtemplates_kfg.kcfgc
index 5dfb39a..a13252c 100644
--- a/templateparser/src/settings/customtemplates_kfg.kcfgc
+++ b/templateparser/src/settings/customtemplates_kfg.kcfgc
@@ -5,6 +5,6 @@ Mutators=true
ItemAccessors=true
SetUserTexts=true
Visibility=TEMPLATEPARSER_EXPORT
-IncludeFiles=templateparser/templateparser_export.h
+IncludeFiles=templateparser_export.h
TranslationDomain=libtemplateparser
TranslationSystem=kde
diff --git a/templateparser/src/settings/globalsettings_templateparser.kcfgc b/templateparser/src/settings/globalsettings_templateparser.kcfgc
index 11abaa4..0a4b874 100644
--- a/templateparser/src/settings/globalsettings_templateparser.kcfgc
+++ b/templateparser/src/settings/globalsettings_templateparser.kcfgc
@@ -6,6 +6,6 @@ Mutators=true
Singleton=true
ItemAccessors=true
SetUserTexts=true
-IncludeFiles=templateparser/templateparser_export.h,templateparser/defaulttemplates.h
+IncludeFiles=templateparser_export.h,templateparser/defaulttemplates.h
TranslationDomain=libtemplateparser
TranslationSystem=kde