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

QmlDebug: Streamline command line parameter creation

Browse Source 
We always have a port now in advance and can construct the
command line directly.

Change-Id: I12dba553f4ef073d7c5b00477baf9fa0e5596bdb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2017-09-05 16:38:09 +02:00
parent a31ec6689d
commit 2edbefcb5d
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/qmldebug/qmldebugcommandlinearguments.h
View File

@@ -66,12 +66,9 @@ static inline QString qmlDebugCommandLineArguments(QmlDebugServicesPreset servic
} }
static inline QString qmlDebugTcpArguments(QmlDebugServicesPreset services, static inline QString qmlDebugTcpArguments(QmlDebugServicesPreset services,
Utils::Port port = Utils::Port(), Utils::Port port, bool block = true)
bool block = true)
{ {
return qmlDebugCommandLineArguments(services, port.isValid() ? return qmlDebugCommandLineArguments(services, QString("port:%1").arg(port.number()), block);
QString::fromLatin1("port:%1").arg(port.number()) :
QStringLiteral("port:%qml_port%"), block);
} }
static inline QString qmlDebugNativeArguments(QmlDebugServicesPreset services, bool block = true) static inline QString qmlDebugNativeArguments(QmlDebugServicesPreset services, bool block = true)
@@ -85,15 +82,4 @@ static inline QString qmlDebugLocalArguments(QmlDebugServicesPreset services, co
return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block); return qmlDebugCommandLineArguments(services, QLatin1String("file:") + socket, block);
} }
static inline QString qmlDebugArguments(QmlDebugServicesPreset services, const QUrl &serverUrl,
bool block = true)
{
if (serverUrl.scheme() == "socket")
return qmlDebugCommandLineArguments(services, "file:" + serverUrl.path(), block);
else
return qmlDebugCommandLineArguments(services, serverUrl.port() != -1 ?
QString("port:%1").arg(serverUrl.port()) :
"port:%qml_port%", block);
}
} // namespace QmlDebug } // namespace QmlDebug

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

@@ -283,7 +283,13 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q
addStartDependency(m_profiler); addStartDependency(m_profiler);
StandardRunnable debuggee = runnable().as<StandardRunnable>(); StandardRunnable debuggee = runnable().as<StandardRunnable>();
QString arguments = QmlDebug::qmlDebugArguments(QmlDebug::QmlProfilerServices, serverUrl);
QString code = serverUrl.scheme() == "socket"
? QString("file:%1").arg(serverUrl.path())
: QString("port:%1").arg(serverUrl.port());
QString arguments = QmlDebug::qmlDebugCommandLineArguments(QmlDebug::QmlProfilerServices,
code, true);
if (!debuggee.commandLineArguments.isEmpty()) if (!debuggee.commandLineArguments.isEmpty())
arguments += ' ' + debuggee.commandLineArguments; arguments += ' ' + debuggee.commandLineArguments;