diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:48:12 +0200 |
commit | 7063fefe4b5e866b27001bb9b911fc2f68034e40 (patch) | |
tree | 1ce35139475d83399572a3265414c2da3443a321 /tools/qmlprofiler | |
parent | f3446071da8357620d0c8593a04e3b4fbba88f21 (diff) | |
parent | 4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875
Diffstat (limited to 'tools/qmlprofiler')
-rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.cpp | 2 | ||||
-rw-r--r-- | tools/qmlprofiler/qmlprofilerdata.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp index 93cc49659f..74356c21a3 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.cpp +++ b/tools/qmlprofiler/qmlprofilerapplication.cpp @@ -475,7 +475,7 @@ void QmlProfilerApplication::run() connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished())); logStatus(QString("Starting '%1 %2' ...").arg(m_programPath, - arguments.join(" "))); + arguments.join(QLatin1Char(' ')))); m_process->start(m_programPath, arguments); if (!m_process->waitForStarted()) { logError(QString("Could not run '%1': %2").arg(m_programPath, diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp index a8a5b1f7b3..91ffbac4a9 100644 --- a/tools/qmlprofiler/qmlprofilerdata.cpp +++ b/tools/qmlprofiler/qmlprofilerdata.cpp @@ -233,8 +233,8 @@ void QmlProfilerData::addQmlEvent(QQmlProfilerDefinitions::RangeType type, if (data.isEmpty()) details = tr("Source code not available"); else { - details = data.join(QStringLiteral(" ")).replace( - QLatin1Char('\n'),QStringLiteral(" ")).simplified(); + details = data.join(QLatin1Char(' ')).replace( + QLatin1Char('\n'), QLatin1Char(' ')).simplified(); QRegExp rewrite(QStringLiteral("\\(function \\$(\\w+)\\(\\) \\{ (return |)(.+) \\}\\)")); bool match = rewrite.exactMatch(details); if (match) { |