Commit 800e42c1 authored by Kimmo Ollila's avatar Kimmo Ollila
Browse files

Fix QtRemoteObjects build on INTEGRITY


Change-Id: I57e69aaba3cb6ac23ba82ae8a85f63ff30e40eb7
Reviewed-by: default avatarBrett Stottlemyer <bstottle@ford.com>
Showing with 6 additions and 6 deletions
......@@ -130,6 +130,11 @@ inline QDataStream& operator>>(QDataStream &stream, QItemSelectionModel::Selecti
return ret;
}
inline QDebug operator<<(QDebug stream, const IndexValuePair &pair)
{
return stream.nospace() << "IndexValuePair[index=" << pair.index << ", data=" << pair.data << ", hasChildren=" << pair.hasChildren << ", flags=" << pair.flags << "]";
}
inline QDebug operator<<(QDebug stream, const DataEntries &entries)
{
return stream.nospace() << "DataEntries[" << entries.data << "]";
......@@ -145,11 +150,6 @@ inline QDataStream& operator>>(QDataStream &stream, DataEntries &entries)
return stream >> entries.data;
}
inline QDebug operator<<(QDebug stream, const IndexValuePair &pair)
{
return stream.nospace() << "IndexValuePair[index=" << pair.index << ", data=" << pair.data << ", hasChildren=" << pair.hasChildren << ", flags=" << pair.flags << "]";
}
inline QDataStream& operator<<(QDataStream &stream, const IndexValuePair &pair)
{
return stream << pair.index << pair.data << pair.hasChildren << static_cast<int>(pair.flags);
......
......@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
using namespace QRemoteObjectPackets;
#ifndef Q_OS_WIN
#if !defined(Q_OS_WIN) && !defined(Q_OS_INTEGRITY)
Q_STATIC_ASSERT_X(&QRemoteObjectReplica::staticMetaObject == &QRemoteObjectDynamicReplica::staticMetaObject,
"m_signalOffset initializer expects QRemoteObjectDynamicReplica to not have a unique staticMetaObject");
#endif
......
Supports Markdown
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