Merge branch 'qtupgrade-5.6' into 'master'

[qtcontacts-sqlite] Compile with Qt5.6. Contributes to JB#35409 Do not merge until Qt 5.6 has merged. See merge request !5
sailfishos · Oct 8, 2016 · 436927b · 436927b
2 parents 1d98870 + a3a169d
commit 436927b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/src/engine/contactsengine.cpp b/src/engine/contactsengine.cpp
@@ -46,6 +46,7 @@
 #include <QWaitCondition>
 #include <QElapsedTimer>
 #include <QUuid>
+#include <QDataStream>
 
 // ---- for schema modification ------
 #include <QtContacts/QContactFamily>

diff --git a/src/engine/contactstransientstore.cpp b/src/engine/contactstransientstore.cpp
@@ -152,7 +152,7 @@ class SharedMemoryManager
 
         operator bool() const
         {
-            return m_release;
+            return m_release != nullptr;
         }
 
     private:

diff --git a/src/engine/contactstransientstore.h b/src/engine/contactstransientstore.h
@@ -40,6 +40,7 @@
 
 #include <QDateTime>
 #include <QPair>
+#include <QSharedPointer>
 
 QTCONTACTS_USE_NAMESPACE
 

diff --git a/src/extensions/qcontactstatusflags_impl.h b/src/extensions/qcontactstatusflags_impl.h
@@ -55,7 +55,7 @@ void QContactStatusFlags::setFlags(Flags flags)
 
 QContactStatusFlags::Flags QContactStatusFlags::flags() const
 {
-    return Flags(flagsValue());
+    return Flags(static_cast<ulong>(flagsValue()));
 }
 
 void QContactStatusFlags::setFlagsValue(quint64 value)

diff --git a/src/extensions/twowaycontactsyncadapter_impl.h b/src/extensions/twowaycontactsyncadapter_impl.h
@@ -46,6 +46,7 @@
 #include <QContactUrl>
 
 #include <QLocale>
+#include <QDataStream>
 
 #define QTCONTACTS_SQLITE_TWCSA_DEBUG_LOG(msg)                           \
     do {                                                                 \