Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
chat
RocketChatMobileEngine
Commits
cc6c044a
Commit
cc6c044a
authored
Feb 10, 2019
by
armin
Browse files
Merge branch 'osxcompat' into 'master'
Osxcompat See merge request
!122
parents
ae908aa2
280a9c47
Changes
1
Hide whitespace changes
Inline
Side-by-side
api/meteorddp.cpp
View file @
cc6c044a
...
...
@@ -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"
)
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment