diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 20:09:49 +0200 |
commit | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (patch) | |
tree | dd3b49b40ed01cad1c2cdc206ec73271bca6e942 /tools/qmlprofiler | |
parent | 94e337fa95425d259e81b4d21f4d0853108553bd (diff) | |
parent | 668ccf18dc8d5ddf403667f19a5b08f2b7c18639 (diff) |
Merge dev into 5.6
Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360
Diffstat (limited to 'tools/qmlprofiler')
-rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp index 188373ccc6..1eab1a0a8c 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.cpp +++ b/tools/qmlprofiler/qmlprofilerapplication.cpp @@ -476,7 +476,8 @@ void QmlProfilerApplication::run() if (m_runMode == LaunchMode) { m_process = new QProcess(this); QStringList arguments; - arguments << QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(m_port); + arguments << QString::fromLatin1("-qmljsdebugger=port:%1,block,services:CanvasFrameRate") + .arg(m_port); arguments << m_programArguments; m_process->setProcessChannelMode(QProcess::MergedChannels); |