Git commit 80f0734c00bef4010fd3f6442c5816b07627f1a5 by Montel Laurent.
Committed on 30/04/2014 at 20:49.
Pushed by mlaurent into branch 'frameworks'.

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

Conflicts:
	kaddressbook/merge/searchpotentialduplicatecontactjob.h
	kaddressbook/merge/tests/CMakeLists.txt

M  +4    -1    kaddressbook/merge/searchpotentialduplicatecontactjob.h
M  +2    -0    kaddressbook/merge/tests/CMakeLists.txt
M  +12   -2    knotes/notes/knote.cpp
M  +1    -0    knotes/notes/knote.h

http://commits.kde.org/kdepim/80f0734c00bef4010fd3f6442c5816b07627f1a5

diff --cc kaddressbook/merge/searchpotentialduplicatecontactjob.h
index 50011b4,c785eff..24461a8
--- a/kaddressbook/merge/searchpotentialduplicatecontactjob.h
+++ b/kaddressbook/merge/searchpotentialduplicatecontactjob.h
@@@ -20,9 -20,12 +20,12 @@@
  #define SEARCHPOTENTIALDUPLICATECONTACTJOB_H
  =

  #include <QObject>
 -#include <Akonadi/Item>
 +#include <AkonadiCore/Item>
+ =

+ #include "kaddressbook_export.h"
+ =

  namespace KABMergeContacts {
- class SearchPotentialDuplicateContactJob : public QObject
+ class KADDRESSBOOK_EXPORT SearchPotentialDuplicateContactJob : public QOb=
ject
  {
      Q_OBJECT
  public:
diff --cc kaddressbook/merge/tests/CMakeLists.txt
index 4615cf8,1bb4050..6c96fd7
--- a/kaddressbook/merge/tests/CMakeLists.txt
+++ b/kaddressbook/merge/tests/CMakeLists.txt
@@@ -13,11 -13,13 +13,13 @@@ endmacro(
  kaddressbook_merge(mergecontactwidgettest.cpp)
  kaddressbook_merge(mergecontacttest.cpp)
  =

 +#REACTIVATE
 +#include(AkonadiMacros)
 +#set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
 +#set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
  =

 -include(AkonadiMacros)
 -set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
 -set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
 -
 -add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "" "ka=
ddressbookprivate")
 -add_akonadi_isolated_test_advanced( mergecontactshowresultdialogtest.cpp =
"" "kaddressbookprivate")
 -add_akonadi_isolated_test_advanced( mergecontactselectinformationdialogte=
st.cpp "" "kaddressbookprivate")
 -add_akonadi_isolated_test_advanced( mergecontactduplicatecontactdialogtes=
t.cpp "" "kaddressbookprivate")
 -add_akonadi_isolated_test_advanced( searchpotentialduplicatecontactjobtes=
t.cpp "" "kaddressbookprivate")
 +#add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "" "k=
addressbookprivate")
 +#add_akonadi_isolated_test_advanced( mergecontactshowresultdialogtest.cpp=
 "" "kaddressbookprivate")
 +#add_akonadi_isolated_test_advanced( mergecontactselectinformationdialogt=
est.cpp "" "kaddressbookprivate")
++#add_akonadi_isolated_test_advanced( mergecontactduplicatecontactdialogte=
st.cpp "" "kaddressbookprivate")
++#add_akonadi_isolated_test_advanced( searchpotentialduplicatecontactjobte=
st.cpp "" "kaddressbookprivate")