[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks
From:       Montel Laurent <montel () kde ! org>
Date:       2014-05-02 7:58:36
Message-ID: E1Wg8Me-0008Jn-1u () scm ! kde ! org
[Download RAW message or body]

Git commit b69686c4a3bcfd6d5ea2134691727e33bfc4f852 by Montel Laurent.
Committed on 02/05/2014 at 07:58.
Pushed by mlaurent into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	knotes/configdialog/knotecollectionconfigwidget.cpp

M  +4    -4    kaddressbook/merge/searchpotentialduplicatecontactjob.h
M  +64   -2    knotes/configdialog/knotecollectionconfigwidget.cpp
M  +7    -2    knotes/configdialog/knotecollectionconfigwidget.h

http://commits.kde.org/kdepim/b69686c4a3bcfd6d5ea2134691727e33bfc4f852

diff --cc knotes/configdialog/knotecollectionconfigwidget.cpp
index 8a3971a,29e70b5..85f1aa5
--- a/knotes/configdialog/knotecollectionconfigwidget.cpp
+++ b/knotes/configdialog/knotecollectionconfigwidget.cpp
@@@ -22,14 -22,18 +22,19 @@@
  #include "akonadi_next/note.h"
  #include "notesharedglobalconfig.h"
  =

 -#include <Akonadi/CollectionModifyJob>
 -#include <Akonadi/CollectionFilterProxyModel>
 +#include <AkonadiCore/CollectionModifyJob>
 +#include <AkonadiCore/CollectionFilterProxyModel>
  #include <KRecursiveFilterProxyModel>
+ #include <KInputDialog>
  =

 -#include <Akonadi/EntityTreeView>
 -#include <Akonadi/CollectionRequester>
 -#include <Akonadi/ChangeRecorder>
 -#include <Akonadi/EntityTreeModel>
 -#include <Akonadi/Collection>
 -#include <Akonadi/EntityDisplayAttribute>
 -#include <Akonadi/CollectionModifyJob>
 +#include <AkonadiWidgets/CollectionRequester>
 +#include <AkonadiCore/ChangeRecorder>
 +#include <AkonadiCore/EntityTreeModel>
 +#include <AkonadiCore/Collection>
++#include <AkonadiWidgets/EntityTreeView>
++#include <AkonadiCore/EntityDisplayAttribute>
++#include <AkonadiCore/CollectionModifyJob>
++
  #include <KMime/Message>
  =

  #include <KCheckableProxyModel>
@@@ -37,7 -41,8 +42,8 @@@
  #include <KLocalizedString>
  #include <KPushButton>
  #include <KLineEdit>
 -#include <KDebug>
 +#include <QDebug>
+ #include <KMessageBox>
  =

  #include <QVBoxLayout>
  #include <QHBoxLayout>
[prev in list] [next in list] [prev in thread] [next in thread]