diff options
| author | Eike Ziller <[email protected]> | 2018-04-17 10:09:35 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2018-04-17 10:09:35 +0200 |
| commit | 185fe0c705ceb01f06ba600e053ef8a2fc3f60ba (patch) | |
| tree | f4cfa8ef2337cdc87ab3cfbfcfeaca196ecf5234 /src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | |
| parent | 32a219f5c1f8d9b967b1a42018fb318216345e12 (diff) | |
| parent | 9a946decc3d516ad4210fb06cb2c93489a2a44c8 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/android/androidrunnable.h
src/plugins/android/androidrunner.cpp
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
src/plugins/qmakeprojectmanager/qmakeproject.cpp
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
Change-Id: I68093d44cfd672347eab82459ff70c21a32297ce
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 9774aa67319..98345f8e6f2 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -45,6 +45,7 @@ #include <qmldebug/qmldebugcommandlinearguments.h> #include <utils/qtcassert.h> +#include <utils/qtcprocess.h> #include <utils/url.h> #include <QMessageBox> @@ -253,8 +254,8 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(QmlProfilerTool *profilerTool, else QTC_CHECK(false); - QString arguments = QmlDebug::qmlDebugCommandLineArguments(QmlDebug::QmlProfilerServices, - code, true); + QString arguments = Utils::QtcProcess::quoteArg( + QmlDebug::qmlDebugCommandLineArguments(QmlDebug::QmlProfilerServices, code, true)); if (!debuggee.commandLineArguments.isEmpty()) arguments += ' ' + debuggee.commandLineArguments; |