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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: Ic7cba72e7bec10e4fc0099b97e3317e391a6aa5d
This commit is contained in:
Eike Ziller
2015-11-03 13:06:35 +01:00
parent 406d231f1b 62393af0ab
commit 81e9b96148
34 changed files with 469 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,7 @@ void QmlProfilerClientManager::setTcpConnection(QString host, quint64 port)
{
d->tcpHost = host;
d->tcpPort = port;
disconnectClient();
}
void QmlProfilerClientManager::clearBufferedData()
@@ -139,6 +140,8 @@ void QmlProfilerClientManager::connectClient(quint16 port)
this, &QmlProfilerClientManager::qmlDebugConnectionOpened);
connect(d->connection, &QmlDebugConnection::closed,
this, &QmlProfilerClientManager::qmlDebugConnectionClosed);
connect(d->connection, &QmlDebugConnection::error,
this, &QmlProfilerClientManager::qmlDebugConnectionError);
d->connectionTimer.start();
d->tcpPort = port;
}
@@ -270,6 +273,17 @@ void QmlProfilerClientManager::qmlDebugConnectionClosed()
emit connectionClosed();
}
void QmlProfilerClientManager::qmlDebugConnectionError(QDebugSupport::Error error)
{
logState(tr("Debug connection error %1").arg(error));
if (d->connection->isOpen()) {
disconnectClient();
emit connectionClosed();
} else {
disconnectClient();
}
}
void QmlProfilerClientManager::logState(const QString &msg)
{
QString state = QLatin1String("QML Profiler: ") + msg;