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

Debugger: Only use random QML port if none was given

Browse Source 
This is a cherry-pick of 20db17e4f0 from
4.1. The problem also occurs in 4.0 and as another version of 4.0 might
be released, we should fix it there, too.

Change-Id: I3cf42abfa9d0ea5812495be6e2728264dc115ba9
Task-number: QTCREATORBUG-16708
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-03 16:27:22 +02:00
parent 252a3f89c6
commit e84abe3af1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -450,15 +450,18 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const
if (m_rp.languages & QmlLanguage) { if (m_rp.languages & QmlLanguage) {
if (m_rp.device && m_rp.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { if (m_rp.device && m_rp.device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
QTcpServer server; if (m_rp.qmlServerAddress.isEmpty() || m_rp.qmlServerPort == InvalidPort) {
const bool canListen = server.listen(QHostAddress::LocalHost) QTcpServer server;
|| server.listen(QHostAddress::LocalHostIPv6); const bool canListen = server.listen(QHostAddress::LocalHost)
if (!canListen) { || server.listen(QHostAddress::LocalHostIPv6);
m_errors.append(DebuggerPlugin::tr("Not enough free ports for QML debugging.") + QLatin1Char(' ')); if (!canListen) {
return; m_errors.append(DebuggerPlugin::tr("Not enough free ports for QML debugging.")
+ QLatin1Char(' '));
return;
}
m_rp.qmlServerAddress = server.serverAddress().toString();
m_rp.qmlServerPort = server.serverPort();
} }
m_rp.qmlServerAddress = server.serverAddress().toString();
m_rp.qmlServerPort = server.serverPort();
// Makes sure that all bindings go through the JavaScript engine, so that // Makes sure that all bindings go through the JavaScript engine, so that
// breakpoints are actually hit! // breakpoints are actually hit!