Commit 9099a37d authored by Eike Ziller's avatar Eike Ziller Committed by Ulf Hermann
Browse files

Fix merge issue



Change-Id: I414a72ba77ea5218711fb9a8b0d3d160670a93d2
Reviewed-by: default avatarUlf Hermann <ulf.hermann@theqtcompany.com>
parent fa227a4e
......@@ -279,7 +279,7 @@ void QmlProfilerClientManager::tryToConnect()
// connection first to be established and then torn down again.
delete d->connection;
d->connection = 0;
connectClient(d->tcpPort);
connectTcpClient(d->tcpPort);
connectToClient();
} else if (d->connectionAttempts == 50) {
d->connectionTimer.stop();
......@@ -350,7 +350,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
switch (result) {
case QMessageBox::Retry: {
connectClient(d->tcpPort);
connectTcpClient(d->tcpPort);
d->connectionAttempts = 0;
d->connectionTimer.start();
break;
......
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