Git commit 42f91fa2d33aa6bf51d277d6fe4dd8087772003e by Tobias Koenig.
Committed on 03/03/2013 at 17:58.
Pushed by tokoe into branch 'master'.

Merge branch 'KDE/4.10'

M  +6    -0    akonadi/collectionsync.cpp
M  +1    -1    akonadi/protocolhelper.cpp

http://commits.kde.org/kdepimlibs/42f91fa2d33aa6bf51d277d6fe4dd8087772003e

diff --cc akonadi/collectionsync.cpp
index d042d9d,bb44fc3..0b85c2b
--- a/akonadi/collectionsync.cpp
+++ b/akonadi/collectionsync.cpp
@@@ -26,9 -26,10 +26,10 @@@
  #include "collectionmodifyjob.h"
  #include "collectionfetchscope.h"
  #include "collectionmovejob.h"
+ #include "entitydisplayattribute.h"
  =

  #include <kdebug.h>
 -#include <KLocale>
 +#include <KLocalizedString>
  #include <QtCore/QVariant>
  =

  using namespace Akonadi;
diff --cc akonadi/protocolhelper.cpp
index ca4b412,8863c7c..8e5c088
--- a/akonadi/protocolhelper.cpp
+++ b/akonadi/protocolhelper.cpp
@@@ -269,10 -269,8 +269,10 @@@ QByteArray ProtocolHelper::itemFetchSco
      command +=3D " " AKONADI_PARAM_ALLATTRIBUTES;
    if ( fetchScope.cacheOnly() )
      command +=3D " " AKONADI_PARAM_CACHEONLY;
 +  if ( fetchScope.checkForCachedPayloadPartsOnly() )
 +    command +=3D " " AKONADI_PARAM_CHECKCACHEDPARTSONLY;
    if ( fetchScope.ignoreRetrievalErrors() )
-     command +=3D " " AKONADI_PARAM_IGNOREERRORS;
+     command +=3D " " "IGNOREERRORS";
    if ( fetchScope.ancestorRetrieval() !=3D ItemFetchScope::None ) {
      switch ( fetchScope.ancestorRetrieval() ) {
        case ItemFetchScope::Parent: