summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-21 16:11:17 +0200
committerMontel Laurent <[email protected]>2015-09-21 16:11:17 +0200
commit1e41611ee87ebc9c703c0455d60595ccbef9881c (patch)
treec86922b8caffe266c799c529ad027c68da2d2167
parent44eb144e3d25ad635cbc4604f259ef6059466c9e (diff)
Make it compile
-rw-r--r--kmail/configuredialog/configureappearancepage.cpp2
-rw-r--r--kmail/kmkernel.cpp2
-rw-r--r--messagelist/src/CMakeLists.txt8
-rw-r--r--messagelist/src/core/manager.cpp2
-rw-r--r--messagelist/src/core/storagemodelbase.cpp2
-rw-r--r--messagelist/src/core/themedelegate.cpp2
-rw-r--r--messagelist/src/core/view.cpp2
-rw-r--r--messagelist/src/core/widgetbase.cpp2
-rw-r--r--messagelist/src/core/widgets/quicksearchline.cpp2
-rw-r--r--messagelist/src/messagelistutil.cpp2
-rw-r--r--messagelist/src/pane.cpp2
-rw-r--r--messagelist/src/storagemodel.cpp2
-rw-r--r--messagelist/src/utils/aggregationcombobox.cpp2
-rw-r--r--messagelist/src/utils/themecombobox.cpp2
-rw-r--r--messagelist/src/widget.cpp2
15 files changed, 18 insertions, 18 deletions
diff --git a/kmail/configuredialog/configureappearancepage.cpp b/kmail/configuredialog/configureappearancepage.cpp
index c37a681..9640cd0 100644
--- a/kmail/configuredialog/configureappearancepage.cpp
+++ b/kmail/configuredialog/configureappearancepage.cpp
@@ -23,7 +23,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "messagelist/aggregationconfigbutton.h"
#include "messagelist/themecombobox.h"
#include "messagelist/themeconfigbutton.h"
-#include "messagelist/settings.h"
+#include "settings.h"
#include "MailCommon/TagWidget"
#include "MailCommon/Tag"
#include "kmkernel.h"
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 82ebecf..cdc2e5f 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -46,7 +46,7 @@ using KMail::MailServiceImpl;
#include "mailcommon/jobscheduler.h"
#include "MessageCore/MessageCoreSettings"
-#include "messagelist/settings.h"
+#include "settings.h"
#include "messagelist/messagelistutil.h"
#include "messageviewer/messageviewersettings.h"
#include "MessageComposer/AkonadiSender"
diff --git a/messagelist/src/CMakeLists.txt b/messagelist/src/CMakeLists.txt
index dee5772..a3ab2ed 100644
--- a/messagelist/src/CMakeLists.txt
+++ b/messagelist/src/CMakeLists.txt
@@ -55,7 +55,7 @@ set(libmessagelist_core_HEADERS
core/model.h
core/modelinvariantindex.h
core/modelinvariantrowmapper.h
- ${CMAKE_CURRENT_BINARY_DIR}/core/settings.h
+ ${CMAKE_CURRENT_BINARY_DIR}/settings.h
core/storagemodelbase.h
core/view.h
core/widgetbase.h
@@ -70,7 +70,7 @@ set(libmessagelist_utils_HEADERS
utils/themeconfigbutton.h
)
-kconfig_add_kcfg_files(libmessagelist_SRCS USE_RELATIVE_PATH
+kconfig_add_kcfg_files(libmessagelist_SRCS
core/settings.kcfgc
)
@@ -79,7 +79,7 @@ generate_export_header(KF5MessageList BASE_NAME messagelist)
add_library(KF5::MessageList ALIAS KF5MessageList)
target_include_directories(KF5MessageList INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/MessageList/;${KDE_INSTALL_INCLUDEDIR_KF5}/messagelist>")
-target_include_directories(KF5MessageList PUBLIC "$<BUILD_INTERFACE:${MessageList_SOURCE_DIR}/src;${MessageList_BINARY_DIR}/src;>")
+target_include_directories(KF5MessageList PUBLIC "$<BUILD_INTERFACE:${MessageList_SOURCE_DIR}/src;${MessageList_BINARY_DIR}/src;${MessageList_BINARY_DIR}/src/core/>")
target_link_libraries(KF5MessageList
@@ -164,7 +164,7 @@ install(FILES
${MessageList_HEADERS}
${MessageList_widgets_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/messagelist_export.h
- ${CMAKE_CURRENT_BINARY_DIR}/core/settings.h
+ ${CMAKE_CURRENT_BINARY_DIR}/settings.h
${MessageList_CamelCase_HEADERS}
${MessageList_core_HEADERS}
${MessageList_util_HEADERS}
diff --git a/messagelist/src/core/manager.cpp b/messagelist/src/core/manager.cpp
index 98f8baf..1fc47ba 100644
--- a/messagelist/src/core/manager.cpp
+++ b/messagelist/src/core/manager.cpp
@@ -27,7 +27,7 @@
#include "core/storagemodelbase.h"
#include "core/model.h"
#include "core/model_p.h"
-#include "core/settings.h"
+#include "settings.h"
#include "utils/configureaggregationsdialog.h"
#include "utils/configureaggregationsdialog_p.h"
diff --git a/messagelist/src/core/storagemodelbase.cpp b/messagelist/src/core/storagemodelbase.cpp
index cd96780..a5a44f3 100644
--- a/messagelist/src/core/storagemodelbase.cpp
+++ b/messagelist/src/core/storagemodelbase.cpp
@@ -20,7 +20,7 @@
#include "core/storagemodelbase.h"
-#include "core/settings.h"
+#include "settings.h"
using namespace MessageList::Core;
diff --git a/messagelist/src/core/themedelegate.cpp b/messagelist/src/core/themedelegate.cpp
index 231da4c..a4d7158 100644
--- a/messagelist/src/core/themedelegate.cpp
+++ b/messagelist/src/core/themedelegate.cpp
@@ -22,7 +22,7 @@
#include "core/messageitem.h"
#include "core/groupheaderitem.h"
#include "core/manager.h"
-#include "core/settings.h"
+#include "settings.h"
#include "MessageCore/StringUtil"
#include "MessageCore/MessageCoreSettings"
diff --git a/messagelist/src/core/view.cpp b/messagelist/src/core/view.cpp
index 4e2d441..34a8b22 100644
--- a/messagelist/src/core/view.cpp
+++ b/messagelist/src/core/view.cpp
@@ -27,7 +27,7 @@
#include "core/messageitem.h"
#include "core/model.h"
#include "core/theme.h"
-#include "core/settings.h"
+#include "settings.h"
#include "core/storagemodelbase.h"
#include "core/widgetbase.h"
#include "messagelistutil.h"
diff --git a/messagelist/src/core/widgetbase.cpp b/messagelist/src/core/widgetbase.cpp
index 3c149ee..f3e4c05 100644
--- a/messagelist/src/core/widgetbase.cpp
+++ b/messagelist/src/core/widgetbase.cpp
@@ -29,7 +29,7 @@
#include "core/model.h"
#include "core/messageitem.h"
#include "core/storagemodelbase.h"
-#include "core/settings.h"
+#include "settings.h"
#include "utils/configureaggregationsdialog.h"
#include "utils/configurethemesdialog.h"
diff --git a/messagelist/src/core/widgets/quicksearchline.cpp b/messagelist/src/core/widgets/quicksearchline.cpp
index 3d8705c..802421d 100644
--- a/messagelist/src/core/widgets/quicksearchline.cpp
+++ b/messagelist/src/core/widgets/quicksearchline.cpp
@@ -19,7 +19,7 @@
*/
#include "quicksearchline.h"
-#include "core/settings.h"
+#include "settings.h"
#include <Akonadi/KMime/MessageStatus>
#include "PimCommon/LineEditWithCompleter"
diff --git a/messagelist/src/messagelistutil.cpp b/messagelist/src/messagelistutil.cpp
index 913d802..16962b1 100644
--- a/messagelist/src/messagelistutil.cpp
+++ b/messagelist/src/messagelistutil.cpp
@@ -16,7 +16,7 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "messagelistutil.h"
-#include "core/settings.h"
+#include "settings.h"
#include <KConfigGroup>
#include <QMenu>
diff --git a/messagelist/src/pane.cpp b/messagelist/src/pane.cpp
index 150126b..0889e67 100644
--- a/messagelist/src/pane.cpp
+++ b/messagelist/src/pane.cpp
@@ -38,7 +38,7 @@
#include "storagemodel.h"
#include "core/widgets/quicksearchline.h"
#include "widget.h"
-#include "core/settings.h"
+#include "settings.h"
#include "core/manager.h"
#include <Akonadi/KMime/MessageStatus>
#include "core/model.h"
diff --git a/messagelist/src/storagemodel.cpp b/messagelist/src/storagemodel.cpp
index 730169e..822f967 100644
--- a/messagelist/src/storagemodel.cpp
+++ b/messagelist/src/storagemodel.cpp
@@ -35,7 +35,7 @@
#include "messagelist_debug.h"
#include <KLocalizedString>
#include "core/messageitem.h"
-#include "core/settings.h"
+#include "settings.h"
#include "messagelistutil.h"
#include <QUrl>
diff --git a/messagelist/src/utils/aggregationcombobox.cpp b/messagelist/src/utils/aggregationcombobox.cpp
index c414e45..52da7d3 100644
--- a/messagelist/src/utils/aggregationcombobox.cpp
+++ b/messagelist/src/utils/aggregationcombobox.cpp
@@ -21,7 +21,7 @@
#include "core/aggregation.h"
#include "core/manager.h"
-#include "core/settings.h"
+#include "settings.h"
#include "storagemodel.h"
using namespace MessageList::Core;
diff --git a/messagelist/src/utils/themecombobox.cpp b/messagelist/src/utils/themecombobox.cpp
index e89f17d..d7cc7ef 100644
--- a/messagelist/src/utils/themecombobox.cpp
+++ b/messagelist/src/utils/themecombobox.cpp
@@ -23,7 +23,7 @@
#include "storagemodel.h"
#include "core/manager.h"
#include "core/theme.h"
-#include "core/settings.h"
+#include "settings.h"
using namespace MessageList::Core;
using namespace MessageList::Utils;
diff --git a/messagelist/src/widget.cpp b/messagelist/src/widget.cpp
index e8c444c..3d34039 100644
--- a/messagelist/src/widget.cpp
+++ b/messagelist/src/widget.cpp
@@ -26,7 +26,7 @@
#include "storagemodel.h"
#include "core/messageitem.h"
#include "core/view.h"
-#include <core/settings.h>
+#include <settings.h>
#include <QTimer>
#include <QAction>