Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	knode/kncomposer.cpp
	knode/knmainwidget.cpp
	libkdepim/addressline/autotests/CMakeLists.txt

configuredialog/configurecomposerpage.cpp

@@ -33,8 +33,8 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include "templateparser/customtemplates.h"
 #include "templateparser/globalsettings_base.h"
 #include "messageviewer/utils/autoqpointer.h"
-#include "addressline/recentaddresses.h"
-#include "addressline/recentaddressdialog.h"
+#include "addressline/recentaddress/recentaddresses.h"
+#include "addressline/recentaddress/recentaddressdialog.h"
 #include <libkdepim/ldap/ldapclientsearch.h>
 #include "addressline/completionorder/completionordereditor.h"
 using KPIM::RecentAddresses;

editor/kmcomposewin.cpp

@@ -118,7 +118,7 @@
 #include "widgets/statusbarlabeltoggledstate.h"
 
 // LIBKDEPIM includes
-#include <libkdepim/addressline/recentaddresses.h>
+#include <libkdepim/addressline/recentaddress/recentaddresses.h>
 
 // KDEPIMLIBS includes
 #include <AkonadiCore/changerecorder.h>

kmkernel.cpp

@@ -12,7 +12,7 @@ using KPIM::BroadcastStatus;
 #include "undostack.h"
 #include "kmreaderwin.h"
 #include "kmmainwidget.h"
-#include "addressline/recentaddresses.h"
+#include "addressline/recentaddress/recentaddresses.h"
 using KPIM::RecentAddresses;
 #include "configuredialog/configuredialog.h"
 #include "kmcommands.h"