Commit cc6c044a authored by armin's avatar armin
Browse files

Merge branch 'osxcompat' into 'master'

Osxcompat

See merge request !122
parents ae908aa2 280a9c47
......@@ -232,7 +232,7 @@ void MeteorDDP::resume()
{
qDebug() << "resuming ddp";
#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX) ||defined(Q_OS_WIN)
#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX) ||defined(Q_OS_WIN) || defined(Q_OS_OSX)
qDebug() << "websocket valid: " << mWebsocket.isValid();
QUrl wsUri = QUrl( QStringLiteral( "wss://" ) + mWebsocketUri + QStringLiteral( "/websocket" ) );
......
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