Commit 1bd2c422 authored by Brett Stottlemyer's avatar Brett Stottlemyer
Browse files

Fixes for CI


The Q_DECL_OVERRIDE should make OSX happy, and it looks like MSVC2013
doesn't like the Q_STATIC_ASSERT_X macro.

Change-Id: I2bd220159e46dc6c07c23b534eaa17cdbdb3c73b
Reviewed-by: default avatarContinuous Integration (KDAB) <build@kdab.com>
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@qt.io>
Showing with 4 additions and 2 deletions
......@@ -85,10 +85,10 @@ public:
bool isValid() const;
QAbstractSocket::SocketState state() const;
bool waitForBytesWritten(int msecs = 30000);
bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
bool waitForConnected(int msecs = 30000);
bool waitForDisconnected(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
Q_SIGNALS:
void connected();
......
......@@ -55,8 +55,10 @@ QT_BEGIN_NAMESPACE
using namespace QRemoteObjectPackets;
#ifndef Q_OS_WIN
Q_STATIC_ASSERT_X(&QRemoteObjectReplica::staticMetaObject == &QRemoteObjectDynamicReplica::staticMetaObject,
"m_signalOffset initializer expects QRemoteObjectDynamicReplica to not have a unique staticMetaObject");
#endif
// If QRemoteObjectDynamicReplica ever gets its own staticMetaObject, some commented out code will need to be
// used. It was changed to avoid a Coverity complaint. We use the above static assert to detect if this changes
// in the future. See FIX #1, #2, #3 in this file.
......
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