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

Merge remote-tracking branch 'origin/3.5'

Browse Source
This commit is contained in:
Eike Ziller
2015-07-08 14:32:13 +02:00
parent 3f5b9b0291 eb5afed10f
commit 37a13732bc
112 changed files with 2229 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,7 +210,7 @@ void QmlProfilerClientManager::disconnectClientSignals()
void QmlProfilerClientManager::connectToClient()
{
if (!d->connection || d->connection->isOpen())
if (!d->connection || d->connection->isOpen() || d->connection->isConnecting())
return;
d->connection->connectToHost(d->tcpHost, d->tcpPort);
@@ -285,6 +285,12 @@ void QmlProfilerClientManager::logState(const QString &msg)
void QmlProfilerClientManager::retryMessageBoxFinished(int result)
{
if (d->connection) {
QTC_ASSERT(!d->connection->isOpen(), return);
if (d->connection->isConnecting())
d->connection->disconnect();
}
switch (result) {
case QMessageBox::Retry: {
d->connectionAttempts = 0;