Commit a3a169d7 authored by martinjones's avatar martinjones

[qtcontacts-sqlite] Compile with Qt5.6. Contributes to JB#35409

parent 1d98870f
......@@ -46,6 +46,7 @@
#include <QWaitCondition>
#include <QElapsedTimer>
#include <QUuid>
#include <QDataStream>
// ---- for schema modification ------
#include <QtContacts/QContactFamily>
......
......@@ -152,7 +152,7 @@ private:
operator bool() const
{
return m_release;
return m_release != nullptr;
}
private:
......
......@@ -40,6 +40,7 @@
#include <QDateTime>
#include <QPair>
#include <QSharedPointer>
QTCONTACTS_USE_NAMESPACE
......
......@@ -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)
......
......@@ -46,6 +46,7 @@
#include <QContactUrl>
#include <QLocale>
#include <QDataStream>
#define QTCONTACTS_SQLITE_TWCSA_DEBUG_LOG(msg) \
do { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment