Fix Organizer API part of QTMOBILITY-898 Missing QDebug<< operators

Task-Number:QTMOBILITY-898
Reviewed-by: Charles Yin
Change-Id: I87bc53e8634b578163b788a120029099af0ecc99

25 files changed, 467 insertions, 2 deletions

diff --git a/src/organizer/filters/qorganizeritemchangelogfilter_p.h b/src/organizer/filters/qorganizeritemchangelogfilter_p.h
index c3fd135244..538f352e9d 100644
--- a/src/organizer/filters/qorganizeritemchangelogfilter_p.h
+++ b/src/organizer/filters/qorganizeritemchangelogfilter_p.h
@@ -106,6 +106,17 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemChangeLogFilter(";
+        dbg.nospace() << "eventType=" << static_cast<quint32>(m_eventType) << ",since=" << m_since;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+
+#endif
+
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemChangeLogFilter, QOrganizerItemFilter::ChangeLogFilter)
 
     QOrganizerItemChangeLogFilter::EventType m_eventType;
diff --git a/src/organizer/filters/qorganizeritemcollectionfilter_p.h b/src/organizer/filters/qorganizeritemcollectionfilter_p.h
index be5a8b38c1..71e1a49de9 100644
--- a/src/organizer/filters/qorganizeritemcollectionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemcollectionfilter_p.h
@@ -60,7 +60,6 @@
 #include <QString>
 #include <QVariant>
 #include <QSet>
-#include <QDebug>
 
 QTM_BEGIN_NAMESPACE
 
@@ -102,6 +101,15 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemCollectionFilter(collectionIds=";
+        dbg.nospace() << m_ids;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
 
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemCollectionFilter, QOrganizerItemFilter::CollectionFilter)
 
diff --git a/src/organizer/filters/qorganizeritemdetailfilter_p.h b/src/organizer/filters/qorganizeritemdetailfilter_p.h
index ad3e230443..2fcf81e552 100644
--- a/src/organizer/filters/qorganizeritemdetailfilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailfilter_p.h
@@ -111,6 +111,18 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemDetailFilter(";
+        dbg.nospace() << "detailDefinitionName=" << m_defId << ","
+                      << "detailFieldName=" << m_fieldId << ","
+                      << "value=" << m_exactValue << ","
+                      << "matchFlags=" << static_cast<quint32>(m_flags);
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
 
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemDetailFilter, QOrganizerItemFilter::OrganizerItemDetailFilter)
 
diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
index ec6dfca465..a7f1a9ac64 100644
--- a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
@@ -124,6 +124,21 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemDetailRangeFilter(";
+        dbg.nospace() << "detailDefinitionName=" << m_defId << ","
+                      << "detailFieldName=" << m_fieldId << ","
+                      << "minValue=" << m_minValue << ","
+                      << "maxValue=" << m_maxValue << ","
+                      << "matchFlags=" << static_cast<quint32>(m_flags) << ","
+                      << "rangeFlags=" << static_cast<quint32>(m_rangeflags);
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemDetailRangeFilter, QOrganizerItemFilter::OrganizerItemDetailRangeFilter)
 
     QString m_defId;
diff --git a/src/organizer/filters/qorganizeritemidfilter_p.h b/src/organizer/filters/qorganizeritemidfilter_p.h
index e81cac2b6d..43c0438df6 100644
--- a/src/organizer/filters/qorganizeritemidfilter_p.h
+++ b/src/organizer/filters/qorganizeritemidfilter_p.h
@@ -59,7 +59,6 @@
 
 #include <QString>
 #include <QVariant>
-#include <QDebug>
 
 QTM_BEGIN_NAMESPACE
 
@@ -101,6 +100,16 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemIdFilter(";
+        dbg.nospace() << "ids=" << m_ids;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemIdFilter, QOrganizerItemFilter::IdFilter)
 
     QList<QOrganizerItemId> m_ids;
diff --git a/src/organizer/filters/qorganizeritemintersectionfilter_p.h b/src/organizer/filters/qorganizeritemintersectionfilter_p.h
index 0fa214f045..31ca4fb35d 100644
--- a/src/organizer/filters/qorganizeritemintersectionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemintersectionfilter_p.h
@@ -100,6 +100,16 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemIntersectionFilter(";
+        dbg.nospace() << "filters=" << m_filters;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemIntersectionFilter, QOrganizerItemFilter::IntersectionFilter)
 
     QList<QOrganizerItemFilter> m_filters;
diff --git a/src/organizer/filters/qorganizeriteminvalidfilter.cpp b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
index 409c836d2b..447a332da3 100644
--- a/src/organizer/filters/qorganizeriteminvalidfilter.cpp
+++ b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
@@ -78,6 +78,14 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemInvalidFilter()";
+        return dbg.maybeSpace() ;
+    }
+#endif
+
     /* There is no way this can be called - d is never detached */
     QOrganizerItemFilterPrivate* clone() const
     {
diff --git a/src/organizer/filters/qorganizeritemunionfilter_p.h b/src/organizer/filters/qorganizeritemunionfilter_p.h
index 62f7f07bef..76e7f765a3 100644
--- a/src/organizer/filters/qorganizeritemunionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemunionfilter_p.h
@@ -100,6 +100,16 @@ public:
         return stream;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemUnionFilter(";
+        dbg.nospace() << "filters=" << m_filters;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     Q_IMPLEMENT_ORGANIZERITEMFILTER_VIRTUALCTORS(QOrganizerItemUnionFilter, QOrganizerItemFilter::UnionFilter)
 
     QList<QOrganizerItemFilter> m_filters;
diff --git a/src/organizer/qorganizerabstractrequest.cpp b/src/organizer/qorganizerabstractrequest.cpp
index b194a318c1..553652a91c 100644
--- a/src/organizer/qorganizerabstractrequest.cpp
+++ b/src/organizer/qorganizerabstractrequest.cpp
@@ -45,6 +45,9 @@
 #include "qorganizermanager_p.h"
 #include "qorganizermanagerengine.h"
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
 
 QTM_BEGIN_NAMESPACE
 
@@ -277,6 +280,22 @@ bool QOrganizerAbstractRequest::waitForFinished(int msecs)
     return false; // unable to wait for operation; not in progress or no engine
 }
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a request to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerAbstractRequest& request)
+{
+    dbg.nospace() << "QOrganizerAbstractRequest(";
+    if (request.d_ptr)
+        request.d_ptr->debugStreamOut(dbg);
+    else
+        dbg.nospace() << "(null)";
+    dbg.nospace() << ")";
+    return dbg.maybeSpace();
+}
+#endif
+
 #include "moc_qorganizerabstractrequest.cpp"
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizerabstractrequest.h b/src/organizer/qorganizerabstractrequest.h
index dd8ccd0f84..8b31179668 100644
--- a/src/organizer/qorganizerabstractrequest.h
+++ b/src/organizer/qorganizerabstractrequest.h
@@ -118,6 +118,9 @@ private:
     friend class QOrganizerManagerEngineV2;
     friend class QOrganizerManagerEngineV2Wrapper;
     friend class QOrganizerAbstractRequestPrivate;
+#ifndef QT_NO_DEBUG_STREAM
+    friend QDebug operator<<(QDebug dbg, const QOrganizerAbstractRequest& request);
+#endif
 };
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizerabstractrequest_p.h b/src/organizer/qorganizerabstractrequest_p.h
index b2abcd6769..aae0572972 100644
--- a/src/organizer/qorganizerabstractrequest_p.h
+++ b/src/organizer/qorganizerabstractrequest_p.h
@@ -61,6 +61,10 @@
 #include <QPointer>
 #include <QMutex>
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerAbstractRequestPrivate
@@ -97,6 +101,11 @@ public:
         }
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    // NOTE: on platforms where Qt is built without debug streams enabled, vtable will differ!
+    virtual QDebug& debugStreamOut(QDebug& dbg) const = 0;
+#endif
+
     QOrganizerManager::Error m_error;
     QOrganizerAbstractRequest::State m_state;
     QPointer<QOrganizerManager> m_manager;
diff --git a/src/organizer/qorganizeritemdetaildefinition.cpp b/src/organizer/qorganizeritemdetaildefinition.cpp
index 068a56ee66..6c45495a32 100644
--- a/src/organizer/qorganizeritemdetaildefinition.cpp
+++ b/src/organizer/qorganizeritemdetaildefinition.cpp
@@ -42,6 +42,10 @@
 #include "qorganizeritemdetaildefinition.h"
 #include "qorganizeritemdetaildefinition_p.h"
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 /*!
@@ -142,6 +146,22 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemDetailDefinition& definit
 }
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a definition to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerItemDetailDefinition& definition)
+{
+    dbg.nospace() << "QOrganizerItemDetailDefinition("
+                  << "name=" << definition.name() << ","
+                  << "isUnique=" << definition.isUnique() << ","
+                  << "isEmpty=" << definition.isEmpty() << ","
+                  << "fields=" << definition.fields()
+                  << ")";
+    return dbg.maybeSpace();
+}
+#endif
+
 /*! Sets the unique identifier of this detail type to \a definitionName. */
 void QOrganizerItemDetailDefinition::setName(const QString& definitionName)
 {
diff --git a/src/organizer/qorganizeritemdetaildefinition.h b/src/organizer/qorganizeritemdetaildefinition.h
index 2a111f9f3c..b52fc7a539 100644
--- a/src/organizer/qorganizeritemdetaildefinition.h
+++ b/src/organizer/qorganizeritemdetaildefinition.h
@@ -99,6 +99,10 @@ Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganizerIte
 Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemDetailDefinition& definition);
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetailDefinition& definition);
+#endif
+
 QTM_END_NAMESPACE
 
 Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailDefinition), Q_MOVABLE_TYPE);
diff --git a/src/organizer/qorganizeritemdetailfielddefinition.cpp b/src/organizer/qorganizeritemdetailfielddefinition.cpp
index d43a38885b..922084c806 100644
--- a/src/organizer/qorganizeritemdetailfielddefinition.cpp
+++ b/src/organizer/qorganizeritemdetailfielddefinition.cpp
@@ -42,6 +42,10 @@
 #include "qorganizeritemdetailfielddefinition.h"
 #include "qorganizeritemdetailfielddefinition_p.h"
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 /*!
@@ -168,4 +172,18 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemDetailFieldDefinition& de
 }
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a definition to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerItemDetailFieldDefinition& definition)
+{
+    dbg.nospace() << "QOrganizerItemDetailFieldDefinition("
+                  << "dataType=" << static_cast<qint32>(definition.dataType()) << ","
+                  << "allowableValues=" << definition.allowableValues()
+                  << ")";
+    return dbg.maybeSpace();
+}
+#endif
+
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemdetailfielddefinition.h b/src/organizer/qorganizeritemdetailfielddefinition.h
index b171d6d420..d3484a5d80 100644
--- a/src/organizer/qorganizeritemdetailfielddefinition.h
+++ b/src/organizer/qorganizeritemdetailfielddefinition.h
@@ -80,6 +80,10 @@ Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganizerIte
 Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemDetailFieldDefinition& definition);
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetailFieldDefinition& definition);
+#endif
+
 QTM_END_NAMESPACE
 
 Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailFieldDefinition), Q_MOVABLE_TYPE);
diff --git a/src/organizer/qorganizeritemfetchhint.cpp b/src/organizer/qorganizeritemfetchhint.cpp
index 96e08796f3..f8d3259f73 100644
--- a/src/organizer/qorganizeritemfetchhint.cpp
+++ b/src/organizer/qorganizeritemfetchhint.cpp
@@ -44,6 +44,10 @@
 
 #include <QStringList>
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 /*!
@@ -192,5 +196,18 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemFetchHint& hint)
 }
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a hint to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerItemFetchHint& hint)
+{
+    dbg.nospace() << "QOrganizerItemFetchHint("
+                  << "detailDefinitionsHint=" << hint.detailDefinitionsHint() << ","
+                  << "optimizationHints=" << static_cast<quint32>(hint.optimizationHints())
+                  << ")";
+    return dbg.maybeSpace();
+}
+#endif
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemfetchhint.h b/src/organizer/qorganizeritemfetchhint.h
index bc3cc5bbc6..8e74a62363 100644
--- a/src/organizer/qorganizeritemfetchhint.h
+++ b/src/organizer/qorganizeritemfetchhint.h
@@ -84,6 +84,10 @@ Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganizerIte
 Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemFetchHint& hint);
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemFetchHint& hint);
+#endif
+
 QTM_END_NAMESPACE
 
 #endif
diff --git a/src/organizer/qorganizeritemfilter.cpp b/src/organizer/qorganizeritemfilter.cpp
index 03556e9801..c5f28c330c 100644
--- a/src/organizer/qorganizeritemfilter.cpp
+++ b/src/organizer/qorganizeritemfilter.cpp
@@ -217,6 +217,21 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemFilter& filter)
 }
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a filter to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerItemFilter& filter)
+{
+    dbg.nospace() << "QOrganizerItemFilter(";
+    if (filter.d_ptr)
+        filter.d_ptr->debugStreamOut(dbg);
+    else
+        dbg.nospace() << "(null)";
+    dbg.nospace() << ")";
+    return dbg.maybeSpace();
+}
+#endif
 
 /*!
   \internal
diff --git a/src/organizer/qorganizeritemfilter.h b/src/organizer/qorganizeritemfilter.h
index c7fdb58517..32261fa840 100644
--- a/src/organizer/qorganizeritemfilter.h
+++ b/src/organizer/qorganizeritemfilter.h
@@ -115,6 +115,9 @@ protected:
     Q_ORGANIZER_EXPORT friend QDataStream& operator<<(QDataStream& out, const QOrganizerItemFilter& filter);
     Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrganizerItemFilter& filter);
 #endif
+#ifndef QT_NO_DEBUG_STREAM
+    Q_ORGANIZER_EXPORT friend QDebug operator<<(QDebug dbg, const QOrganizerItemFilter& filter);
+#endif
     QSharedDataPointer<QOrganizerItemFilterPrivate> d_ptr;
 };
 
diff --git a/src/organizer/qorganizeritemfilter_p.h b/src/organizer/qorganizeritemfilter_p.h
index 406fe7d597..62f5276623 100644
--- a/src/organizer/qorganizeritemfilter_p.h
+++ b/src/organizer/qorganizeritemfilter_p.h
@@ -57,6 +57,10 @@
 #include <QSharedData>
 #include <QDataStream>
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 /* Boiler plate code */
 #define Q_IMPLEMENT_ORGANIZERITEMFILTER_PRIVATE(Class) \
     Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
@@ -89,6 +93,10 @@ public:
     virtual bool compare(const QOrganizerItemFilterPrivate* other) const = 0;
     virtual QDataStream& outputToStream(QDataStream& stream, quint8 formatVersion) const = 0;
     virtual QDataStream& inputFromStream(QDataStream& stream, quint8 formatVersion) = 0;
+#ifndef QT_NO_DEBUG_STREAM
+    // NOTE: on platforms where Qt is built without debug streams enabled, vtable will differ!
+    virtual QDebug& debugStreamOut(QDebug& dbg) const = 0;
+#endif
     virtual QOrganizerItemFilterPrivate* clone() const = 0;
     virtual QOrganizerItemFilter::FilterType type() const = 0;
 
diff --git a/src/organizer/qorganizeritemsortorder.cpp b/src/organizer/qorganizeritemsortorder.cpp
index 06afdc87b3..716837794e 100644
--- a/src/organizer/qorganizeritemsortorder.cpp
+++ b/src/organizer/qorganizeritemsortorder.cpp
@@ -42,6 +42,10 @@
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemsortorder_p.h"
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 QTM_BEGIN_NAMESPACE
 
 /*!
@@ -170,6 +174,23 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemSortOrder& sortOrder)
 }
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a sortOrder to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerItemSortOrder& sortOrder)
+{
+    dbg.nospace() << "QOrganizerItemSortOrder("
+                  << "detailDefinitionName=" << sortOrder.detailDefinitionName() << ","
+                  << "detailFieldName=" << sortOrder.detailFieldName() << ","
+                  << "blankPolicy=" << static_cast<quint32>(sortOrder.blankPolicy()) << ","
+                  << "direction=" << static_cast<quint32>(sortOrder.direction()) << ","
+                  << "caseSensitivity=" << static_cast<quint32>(sortOrder.caseSensitivity())
+                  << ")";
+    return dbg.maybeSpace();
+}
+#endif
+
 /*!
  * Sets the definition name of the details which will be inspected to perform sorting to \a definitionName,
  * and the name of those details' fields which contains the value which organizer items will be sorted by to \a fieldName
diff --git a/src/organizer/qorganizeritemsortorder.h b/src/organizer/qorganizeritemsortorder.h
index a7523fb7ff..ff86c2a826 100644
--- a/src/organizer/qorganizeritemsortorder.h
+++ b/src/organizer/qorganizeritemsortorder.h
@@ -97,6 +97,10 @@ Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganizerIte
 Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemSortOrder& sortOrder);
 #endif
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemSortOrder& sortOrder);
+#endif
+
 QTM_END_NAMESPACE
 
 Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemSortOrder), Q_MOVABLE_TYPE);
diff --git a/src/organizer/qorganizerrecurrencerule.cpp b/src/organizer/qorganizerrecurrencerule.cpp
index bf4c2ddfd6..99e80b94f9 100644
--- a/src/organizer/qorganizerrecurrencerule.cpp
+++ b/src/organizer/qorganizerrecurrencerule.cpp
@@ -43,6 +43,10 @@
 #include <QDateTime>
 #include <QList>
 
+#ifndef QT_NO_DEBUG_STREAM
+#include <QDebug>
+#endif
+
 #include "qtorganizerglobal.h"
 #include "qorganizerrecurrencerule_p.h"
 #include "qorganizerrecurrencerule.h"
@@ -525,5 +529,67 @@ uint qHash(const QOrganizerRecurrenceRule& r)
     return hash * prime1;
 }
 
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+  Outputs \a rule to the debug stream \a dbg
+ */
+QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule& rule)
+{
+    dbg.nospace() << "QOrganizerRecurrenceRule(frequency=" << rule.frequency() << ",";
+    dbg.nospace() << "interval=" << rule.interval() << ",";
+    switch (rule.limitType()) {
+        case QOrganizerRecurrenceRule::CountLimit:
+            dbg.nospace() << "limitCount=" << rule.limitCount();
+            break;
+        case QOrganizerRecurrenceRule::DateLimit:
+            dbg.nospace() << "limitDate=" << rule.limitDate().toString();
+            break;
+        case QOrganizerRecurrenceRule::NoLimit:
+            dbg.nospace() << "no limit";
+            break;
+        default:
+            break;
+    }
+    dbg.nospace() << ",daysOfWeek=\"";
+    foreach(Qt::DayOfWeek day, rule.daysOfWeek()){
+        dbg.nospace() << static_cast<quint32>(day);
+        dbg.space();
+    }
+    dbg.nospace() << "\"";
+
+    dbg.nospace() << ",daysOfMonth=\"";
+    foreach(int day, rule.daysOfMonth()){
+        dbg.nospace() << day;
+        dbg.space();
+    }
+    dbg.nospace() << "\"";
+
+    dbg.nospace() << ",daysOfYear=\"";
+    foreach(int day, rule.daysOfYear()){
+        dbg.nospace() << day;
+        dbg.space();
+    }
+    dbg.nospace() << "\"";
+
+    dbg.nospace() << ",monthsOfYear=\"";
+    foreach(QOrganizerRecurrenceRule::Month month, rule.monthsOfYear()){
+        dbg.nospace() << static_cast<quint32>(month);
+        dbg.space();
+    }
+    dbg.nospace() << "\"";
+
+    dbg.nospace() << ",positions=\"";
+    foreach(int position, rule.positions()){
+        dbg.nospace() << position;
+        dbg.space();
+    }
+    dbg.nospace() << "\",";
+
+    dbg.nospace() << "firstDayOfWeek=" << static_cast<quint32>(rule.firstDayOfWeek());
+    dbg.nospace() << ')';
+    return dbg.maybeSpace();
+}
+#endif
+
 QTM_END_NAMESPACE
 
diff --git a/src/organizer/qorganizerrecurrencerule.h b/src/organizer/qorganizerrecurrencerule.h
index 25b982baa5..c6710dbfdb 100644
--- a/src/organizer/qorganizerrecurrencerule.h
+++ b/src/organizer/qorganizerrecurrencerule.h
@@ -143,6 +143,9 @@ private:
 //hash functions
 Q_ORGANIZER_EXPORT uint qHash(const QOrganizerRecurrenceRule& rule);
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerRecurrenceRule& rule);
+#endif
 
 inline uint qHash(QOrganizerRecurrenceRule::Month month)
 {
diff --git a/src/organizer/requests/qorganizeritemrequests_p.h b/src/organizer/requests/qorganizeritemrequests_p.h
index ef0e577377..414c14b37f 100644
--- a/src/organizer/requests/qorganizeritemrequests_p.h
+++ b/src/organizer/requests/qorganizeritemrequests_p.h
@@ -82,6 +82,18 @@ public:
         return QOrganizerAbstractRequest::ItemSaveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemSaveRequest(\n"
+                      << "* items=" << m_organizeritems << ",\n"
+                      << "* definitionMask=" << m_definitionMask << ",\n"
+                      << "* errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerItem> m_organizeritems;
     QMap<int, QOrganizerManager::Error> m_errors;
     QStringList m_definitionMask;
@@ -105,6 +117,22 @@ public:
         return QOrganizerAbstractRequest::ItemFetchRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemFetchRequest(\n"
+                      << "* items=" << m_organizeritems << ",\n"
+                      << "* filter=" << m_filter << ",\n"
+                      << "* sorting=" << m_sorting << ",\n"
+                      << "* startDate=" << m_startDate << ",\n"
+                      << "* endDate=" << m_endDate << ",\n"
+                      << "* fetchHint=" << m_fetchHint << ",\n"
+                      << "* maxCount=" << m_maxCount;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QOrganizerItemFilter m_filter;
     QList<QOrganizerItemSortOrder> m_sorting;
     QOrganizerItemFetchHint m_fetchHint;
@@ -134,6 +162,21 @@ public:
         return QOrganizerAbstractRequest::ItemFetchForExportRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemFetchForExportRequest(\n"
+                      << "* items=" << m_organizeritems << ",\n"
+                      << "* filter=" << m_filter << ",\n"
+                      << "* sorting=" << m_sorting << ",\n"
+                      << "* startDate=" << m_startDate << ",\n"
+                      << "* endDate=" << m_endDate << ",\n"
+                      << "* fetchHint=" << m_fetchHint;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QOrganizerItemFilter m_filter;
     QList<QOrganizerItemSortOrder> m_sorting;
     QOrganizerItemFetchHint m_fetchHint;
@@ -161,6 +204,19 @@ public:
         return QOrganizerAbstractRequest::ItemFetchByIdRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemFetchByIdRequest(\n"
+                      << "* items=" << m_items << ",\n"
+                      << "* ids=" << m_ids << ",\n"
+                      << "* fetchHint=" << m_fetchHint << ",\n"
+                      << "* errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerItemId> m_ids;
     QOrganizerItemFetchHint m_fetchHint;
 
@@ -186,6 +242,21 @@ public:
         return QOrganizerAbstractRequest::ItemOccurrenceFetchRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemOccurrenceFetchRequest(\n"
+                      << "* itemOccurrences=" << m_organizeritems << ",\n"
+                      << "* parentItem=" << m_generator << ",\n"
+                      << "* startDate=" << m_startDate << ",\n"
+                      << "* endDate=" << m_endDate << ",\n"
+                      << "* fetchHint=" << m_fetchHint << ",\n"
+                      << "* maxOccurrences=" << m_maxOccurrences;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QOrganizerItem m_generator;
     QDateTime m_startDate;
     QDateTime m_endDate;
@@ -212,6 +283,17 @@ public:
         return QOrganizerAbstractRequest::ItemRemoveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemRemoveRequest("
+                      << "itemIds=" << m_organizeritemIds << ","
+                      << "errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerItemId> m_organizeritemIds;
     QMap<int, QOrganizerManager::Error> m_errors;
 };
@@ -233,6 +315,20 @@ public:
         return QOrganizerAbstractRequest::ItemIdFetchRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemIdFetchRequest(\n"
+                      << "* itemIds=" << m_ids << ",\n"
+                      << "* filter=" << m_filter << ",\n"
+                      << "* sorting=" << m_sorting << ",\n"
+                      << "* startDate=" << m_startDate << ",\n"
+                      << "* endDate=" << m_endDate;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QOrganizerItemFilter m_filter;
     QList<QOrganizerItemSortOrder> m_sorting;
 
@@ -260,6 +356,19 @@ public:
         return QOrganizerAbstractRequest::DetailDefinitionFetchRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemDetailDefinitionFetchRequest(\n"
+                      << "* definitionNames=" << m_names << ",\n"
+                      << "* definitions=" << m_definitions << ",\n"
+                      << "* itemType=" << m_organizeritemType << ",\n"
+                      << "* errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QString m_organizeritemType;
     QStringList m_names;
     QMap<QString, QOrganizerItemDetailDefinition> m_definitions;
@@ -284,6 +393,17 @@ public:
         return QOrganizerAbstractRequest::DetailDefinitionSaveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemDetailDefinitionSaveRequest(\n"
+                      << "* definitions=" << m_definitions << ",\n"
+                      << "* itemType=" << m_organizeritemType << ",\n"
+                      << "* errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
     QString m_organizeritemType;
     QList<QOrganizerItemDetailDefinition> m_definitions;
     QMap<int, QOrganizerManager::Error> m_errors;
@@ -307,6 +427,18 @@ public:
         return QOrganizerAbstractRequest::DetailDefinitionRemoveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerItemDetailDefinitionRemoveRequest(\n"
+                      << "* definitionNames=" << m_names << ",\n"
+                      << "* itemType=" << m_organizeritemType << ",\n"
+                      << "* errorMap=" << m_errors;
+        dbg.nospace() << "\n)";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QString m_organizeritemType;
     QStringList m_names;
     QMap<int, QOrganizerManager::Error> m_errors;
@@ -329,6 +461,16 @@ public:
         return QOrganizerAbstractRequest::CollectionFetchRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerCollectionFetchRequest("
+                      << "collections=" << m_collections;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerCollection> m_collections;
 };
 
@@ -349,6 +491,17 @@ public:
         return QOrganizerAbstractRequest::CollectionRemoveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerCollectionRemoveRequest("
+                      << "collectionIds=" << m_collectionIds << ","
+                      << "errorMap=" << m_errors;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerCollectionId> m_collectionIds;
     QMap<int, QOrganizerManager::Error> m_errors;
 };
@@ -370,6 +523,17 @@ public:
         return QOrganizerAbstractRequest::CollectionSaveRequest;
     }
 
+#ifndef QT_NO_DEBUG_STREAM
+    QDebug& debugStreamOut(QDebug& dbg) const
+    {
+        dbg.nospace() << "QOrganizerCollectionSaveRequest("
+                      << "collections=" << m_collections << ","
+                      << "errorMap=" << m_errors;
+        dbg.nospace() << ")";
+        return dbg.maybeSpace();
+    }
+#endif
+
     QList<QOrganizerCollection> m_collections;
     QMap<int, QOrganizerManager::Error> m_errors;
 };