Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
@@ -25,7 +25,6 @@ SET(LtsProjectionWorkstation_SRCS
|
||||
WebSocket/message_factory.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY2(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS})
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
|
||||
@@ -46,4 +45,3 @@ NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsProjectionWorkstation)
|
||||
ENDIF(BUILD_RTI)
|
||||
+3
-2
@@ -10,7 +10,7 @@
|
||||
#include <QGuiApplication>
|
||||
#include <QTimer>
|
||||
#include <QUuid>
|
||||
#include <QWebSocket>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <utility>
|
||||
|
||||
@@ -41,7 +41,8 @@ bool LtsProjectionWorkstation::hasInstance()
|
||||
}
|
||||
|
||||
LtsProjectionWorkstation::LtsProjectionWorkstation(QObject* parent)
|
||||
: QObject(parent), m_messageFactory(new MessageFactory(this, m_logger)),
|
||||
: QObject(parent), m_logger(getLogger("LtsProjectionWorkstation")),
|
||||
m_messageFactory(new MessageFactory(this, m_logger)),
|
||||
m_webSocketServer(new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this)), m_pendingLoginRequest(nullptr),
|
||||
m_vncManager(new VncServerManager(m_logger, this))
|
||||
{
|
||||
|
||||
+1
-1
@@ -144,7 +144,7 @@ void VncServerManager::slotReadStandardOutput()
|
||||
WARNING_LOG(m_logger) << "Could not retrieve port information from stdout of " << p->program();
|
||||
return;
|
||||
}
|
||||
const quint16 port = match.capturedRef(1).toInt();
|
||||
const quint16 port = match.captured(1).toInt();
|
||||
if (port == 0)
|
||||
return;
|
||||
for (VncScreen& screen : m_vncScreens)
|
||||
|
||||
Reference in new issue
Block a user