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

Conflicts:
	CMakeLists.txt
	kaddressbook/merge/autotests/mergecontactinfowidgettest.cpp
	kaddressbook/merge/autotests/mergecontactselectinformationscrollareatest.cpp
	kaddressbook/merge/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp
	kaddressbook/merge/searchduplicate/searchandmergecontactduplicatecontactdialog.h
	kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp
	kmail/configuredialog/configurecomposerpage.cpp
	kontact/plugins/knotes/knotes_part.cpp
	kontact/plugins/knotes/knotesiconview.cpp
	libkdepim/addressline/addresseelineedit.cpp
	libkdepim/addressline/recentaddresses.cpp
	libkdepim/addressline/recentaddresses.h
	messagecomposer/composer/composerlineedit.cpp
	messageviewer/config-messageviewer.h.cmake
	noteshared/noteutils.cpp
	noteshared/noteutils.h

configuredialog/configurecomposerpage.cpp

@@ -626,16 +626,17 @@ void ComposerPage::GeneralTab::save()
 
 void ComposerPage::GeneralTab::slotConfigureRecentAddresses()
 {
-    MessageViewer::AutoQPointer<KPIM::RecentAddressDialog> dlg(new KPIM::RecentAddressDialog(this));
-    dlg->setAddresses(RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->addresses());
-    if (dlg->exec() && dlg) {
-        RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->clear();
-        const QStringList &addrList = dlg->addresses();
-        QStringList::ConstIterator it;
-        QStringList::ConstIterator end(addrList.constEnd());
-
-        for (it = addrList.constBegin(); it != end; ++it) {
-            RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->add(*it);
+    MessageViewer::AutoQPointer<KPIM::RecentAddressDialog> dlg( new KPIM::RecentAddressDialog( this ) );
+    dlg->setAddresses( RecentAddresses::self(  MessageComposer::MessageComposerSettings::self()->config() )->addresses() );
+    if ( dlg->exec() && dlg ) {
+        if (dlg->wasChanged()) {
+            RecentAddresses::self(  MessageComposer::MessageComposerSettings::self()->config() )->clear();
+            const QStringList &addrList = dlg->addresses();
+            QStringList::ConstIterator it;
+            QStringList::ConstIterator end( addrList.constEnd() );
+
+            for ( it = addrList.constBegin(); it != end; ++it )
+                RecentAddresses::self(  MessageComposer::MessageComposerSettings::self()->config() )->add( *it );
         }
     }
 }