feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix merge issue

Browse Source 
Change-Id: I414a72ba77ea5218711fb9a8b0d3d160670a93d2
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-11-26 13:11:21 +01:00
committed by Ulf Hermann
parent fa227a4eef
commit 9099a37d4b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -279,7 +279,7 @@ void QmlProfilerClientManager::tryToConnect()
// connection first to be established and then torn down again. // connection first to be established and then torn down again.
delete d->connection; delete d->connection;
d->connection = 0; d->connection = 0;
connectClient(d->tcpPort); connectTcpClient(d->tcpPort);
connectToClient(); connectToClient();
} else if (d->connectionAttempts == 50) { } else if (d->connectionAttempts == 50) {
d->connectionTimer.stop(); d->connectionTimer.stop();
@@ -350,7 +350,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
switch (result) { switch (result) {
case QMessageBox::Retry: { case QMessageBox::Retry: {
connectClient(d->tcpPort); connectTcpClient(d->tcpPort);
d->connectionAttempts = 0; d->connectionAttempts = 0;
d->connectionTimer.start(); d->connectionTimer.start();
break; break;