Merge branch '5.8' into dev

Conflicts:
	qmllive.pro

Change-Id: I14a957912a4caaf7a2d3734819d98097f79f2810

1 files changed, 6 insertions, 9 deletions

diff --git a/src/ipc/ipcserver.cpp b/src/ipc/ipcserver.cpp
index f23aaa6..3d8288c 100644
--- a/src/ipc/ipcserver.cpp
+++ b/src/ipc/ipcserver.cpp
@@ -49,10 +49,7 @@
  *
  * \code{.cpp}
  * m_server = new IpcServer(this);
- * connect(
- *   m_server, SIGNAL(received(QString,QByteArray)),
- *   this, SLOT(handleCall(QString, QByteArray))
- * );
+ * connect(m_server, &IpcServer::received, this, &MyHandler::handleCall);
  * m_server->listen(10234);
  *
  * ...
@@ -75,7 +72,7 @@ IpcServer::IpcServer(QObject *parent)
     : QObject(parent)
     , m_server(new QTcpServer(this))
 {
-    connect(m_server, SIGNAL(newConnection()), this, SLOT(newConnection()));
+    connect(m_server, &QTcpServer::newConnection, this, &IpcServer::newConnection);
 }
 
 /*!
@@ -98,8 +95,8 @@ void IpcServer::newConnection()
         emit clientConnected(socket->peerAddress());
         emit clientConnected(socket);
         IpcConnection *connection = new IpcConnection(socket, this);
-        connect(connection, SIGNAL(connectionClosed()), this, SLOT(onConnectionClosed()));
-        connect(connection, SIGNAL(received(QString,QByteArray)), this, SIGNAL(received(QString,QByteArray)));
+        connect(connection, &IpcConnection::connectionClosed, this, &IpcServer::onConnectionClosed);
+        connect(connection, &IpcConnection::received, this, &IpcServer::received);
     }
 }
 
@@ -126,9 +123,9 @@ void IpcServer::setMaxConnections(int num)
 
 /*!
  * \fn void IpcServer::received(const QString& method, const QByteArray& content)
- * \brief signals a ipc call has arrived
+ * \brief signals a IPC call has arrived
  *
- * A ipc call requesting \a method and using \a content a the parameters for the method
+ * A IPC call requesting \a method and using \a content a the parameters for the method
  */
 
 /*!