2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2013-01-28 17:12:19 +01:00
|
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
2012-10-02 09:12:39 +02:00
|
|
|
** Contact: http://www.qt-project.org/legal
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** Commercial License Usage
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
2011-03-25 09:25:17 +01:00
|
|
|
**
|
|
|
|
** GNU Lesser General Public License Usage
|
2012-10-02 09:12:39 +02:00
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
|
** General Public License version 2.1 as published by the Free Software
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
|
|
**
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
2011-03-25 09:25:17 +01:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
****************************************************************************/
|
2011-03-25 09:25:17 +01:00
|
|
|
|
2011-03-11 12:22:57 +01:00
|
|
|
#include "qmlprofilerengine.h"
|
|
|
|
|
2011-06-28 15:51:20 +02:00
|
|
|
#include "localqmlprofilerrunner.h"
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2011-03-24 12:42:15 +01:00
|
|
|
#include <analyzerbase/analyzermanager.h>
|
2011-06-09 14:30:15 +02:00
|
|
|
#include <coreplugin/icore.h>
|
2011-05-04 16:50:24 +02:00
|
|
|
#include <utils/qtcassert.h>
|
2011-06-28 15:51:20 +02:00
|
|
|
#include <coreplugin/helpmanager.h>
|
2013-04-17 11:10:45 +02:00
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
|
|
#include <projectexplorer/kitinformation.h>
|
|
|
|
#include <projectexplorer/target.h>
|
2011-07-05 12:14:41 +02:00
|
|
|
#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
|
2011-07-21 10:42:34 +02:00
|
|
|
#include <qmlprojectmanager/qmlprojectplugin.h>
|
2013-01-29 18:00:30 +01:00
|
|
|
#include <projectexplorer/environmentaspect.h>
|
2011-07-05 12:14:41 +02:00
|
|
|
#include <projectexplorer/localapplicationruncontrol.h>
|
2013-01-28 12:56:56 +01:00
|
|
|
#include <projectexplorer/localapplicationrunconfiguration.h>
|
2012-04-18 12:06:10 +02:00
|
|
|
#include <qmldebug/qmloutputparser.h>
|
2011-05-04 16:50:24 +02:00
|
|
|
|
2012-02-15 10:42:41 +01:00
|
|
|
#include <QMainWindow>
|
|
|
|
#include <QMessageBox>
|
|
|
|
#include <QTimer>
|
2013-04-17 17:58:27 +02:00
|
|
|
#include <QTcpServer>
|
2011-03-11 12:22:57 +01:00
|
|
|
|
2011-06-30 13:44:22 +02:00
|
|
|
using namespace Analyzer;
|
2011-07-05 12:14:41 +02:00
|
|
|
using namespace ProjectExplorer;
|
2011-06-30 13:44:22 +02:00
|
|
|
|
2011-05-20 13:36:16 +02:00
|
|
|
namespace QmlProfiler {
|
|
|
|
namespace Internal {
|
2011-05-04 16:50:24 +02:00
|
|
|
|
|
|
|
//
|
|
|
|
// QmlProfilerEnginePrivate
|
|
|
|
//
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
class QmlProfilerRunControl::QmlProfilerEnginePrivate
|
2011-05-20 13:36:16 +02:00
|
|
|
{
|
|
|
|
public:
|
2013-07-30 14:08:01 +02:00
|
|
|
QmlProfilerEnginePrivate() : m_running(false) {}
|
2011-05-20 13:36:16 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
QmlProfilerStateManager *m_profilerState;
|
2011-07-28 10:38:39 +02:00
|
|
|
QTimer m_noDebugOutputTimer;
|
2012-04-18 12:06:10 +02:00
|
|
|
QmlDebug::QmlOutputParser m_outputParser;
|
2013-07-19 16:13:10 +02:00
|
|
|
bool m_running;
|
2011-05-20 13:36:16 +02:00
|
|
|
};
|
|
|
|
|
2011-05-04 16:50:24 +02:00
|
|
|
//
|
|
|
|
// QmlProfilerEngine
|
|
|
|
//
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
QmlProfilerRunControl::QmlProfilerRunControl(const Analyzer::AnalyzerStartParameters &sp,
|
2011-09-14 13:12:25 +02:00
|
|
|
ProjectExplorer::RunConfiguration *runConfiguration)
|
2013-07-30 14:08:01 +02:00
|
|
|
: AnalyzerRunControl(sp, runConfiguration)
|
|
|
|
, d(new QmlProfilerEnginePrivate)
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState = 0;
|
2011-07-28 10:38:39 +02:00
|
|
|
|
2013-08-08 13:28:08 +02:00
|
|
|
// Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
|
2011-07-28 10:38:39 +02:00
|
|
|
// (application output might be redirected / blocked)
|
|
|
|
d->m_noDebugOutputTimer.setSingleShot(true);
|
|
|
|
d->m_noDebugOutputTimer.setInterval(4000);
|
|
|
|
connect(&d->m_noDebugOutputTimer, SIGNAL(timeout()), this, SLOT(processIsRunning()));
|
2011-10-31 16:42:31 +01:00
|
|
|
|
|
|
|
d->m_outputParser.setNoOutputText(ApplicationLauncher::msgWinCannotRetrieveDebuggingOutput());
|
2012-02-21 15:47:55 +01:00
|
|
|
connect(&d->m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)),
|
|
|
|
this, SLOT(processIsRunning(quint16)));
|
2011-10-31 16:42:31 +01:00
|
|
|
connect(&d->m_outputParser, SIGNAL(noOutputMessage()),
|
|
|
|
this, SLOT(processIsRunning()));
|
|
|
|
connect(&d->m_outputParser, SIGNAL(errorMessage(QString)),
|
|
|
|
this, SLOT(wrongSetupMessageBox(QString)));
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
QmlProfilerRunControl::~QmlProfilerRunControl()
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
if (d->m_profilerState && d->m_profilerState->currentState() == QmlProfilerStateManager::AppRunning)
|
2013-07-30 14:08:01 +02:00
|
|
|
stopEngine();
|
2011-03-11 12:22:57 +01:00
|
|
|
delete d;
|
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
bool QmlProfilerRunControl::startEngine()
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
QTC_ASSERT(d->m_profilerState, return false);
|
|
|
|
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStarting);
|
|
|
|
|
2011-07-21 10:42:34 +02:00
|
|
|
if (QmlProjectManager::QmlProjectRunConfiguration *rc =
|
|
|
|
qobject_cast<QmlProjectManager::QmlProjectRunConfiguration *>(runConfiguration())) {
|
|
|
|
if (rc->observerPath().isEmpty()) {
|
|
|
|
QmlProjectManager::QmlProjectPlugin::showQmlObserverToolWarning();
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
|
2011-07-22 15:26:40 +02:00
|
|
|
AnalyzerManager::stopTool();
|
2011-07-25 14:49:07 +02:00
|
|
|
return false;
|
2011-07-21 10:42:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-02 16:53:48 +02:00
|
|
|
if (startParameters().startMode == StartLocal) {
|
2013-05-03 12:41:58 +02:00
|
|
|
d->m_noDebugOutputTimer.start();
|
2011-09-14 13:12:25 +02:00
|
|
|
} else {
|
2013-04-22 17:11:06 +02:00
|
|
|
emit processRunning(startParameters().analyzerPort);
|
2011-09-14 13:12:25 +02:00
|
|
|
}
|
2011-05-04 16:50:24 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppRunning);
|
2013-07-19 16:13:10 +02:00
|
|
|
engineStarted();
|
2011-07-25 14:49:07 +02:00
|
|
|
return true;
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::stopEngine()
|
2011-03-11 12:22:57 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
QTC_ASSERT(d->m_profilerState, return);
|
|
|
|
|
|
|
|
switch (d->m_profilerState->currentState()) {
|
|
|
|
case QmlProfilerStateManager::AppRunning : {
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopRequested);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case QmlProfilerStateManager::AppReadyToStop : {
|
|
|
|
cancelProcess();
|
|
|
|
break;
|
|
|
|
}
|
2012-05-08 15:14:11 +02:00
|
|
|
case QmlProfilerStateManager::AppDying :
|
|
|
|
// valid, but no further action is needed
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
2012-07-27 15:43:00 +02:00
|
|
|
default: {
|
|
|
|
const QString message = QString::fromLatin1("Unexpected engine stop from state %1 in %2:%3")
|
|
|
|
.arg(d->m_profilerState->currentStateAsString(), QString::fromLatin1(__FILE__), QString::number(__LINE__));
|
|
|
|
qWarning("%s", qPrintable(message));
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
2011-05-04 16:50:24 +02:00
|
|
|
}
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::notifyRemoteFinished(bool success)
|
2011-03-24 12:42:15 +01:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
QTC_ASSERT(d->m_profilerState, return);
|
2011-07-13 14:47:34 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
switch (d->m_profilerState->currentState()) {
|
|
|
|
case QmlProfilerStateManager::AppRunning : {
|
2013-05-07 11:05:22 +02:00
|
|
|
if (success)
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
|
|
|
|
else
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
|
2012-02-24 10:47:17 +01:00
|
|
|
AnalyzerManager::stopTool();
|
2011-03-24 12:42:15 +01:00
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
runControlFinished();
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case QmlProfilerStateManager::AppStopped :
|
2012-05-08 15:14:11 +02:00
|
|
|
case QmlProfilerStateManager::AppKilled :
|
2012-02-24 10:47:17 +01:00
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
|
|
|
|
break;
|
2012-07-27 15:43:00 +02:00
|
|
|
default: {
|
|
|
|
const QString message = QString::fromLatin1("Process died unexpectedly from state %1 in %2:%3")
|
|
|
|
.arg(d->m_profilerState->currentStateAsString(), QString::fromLatin1(__FILE__), QString::number(__LINE__));
|
|
|
|
qWarning("%s", qPrintable(message));
|
|
|
|
}
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
|
|
|
}
|
2011-04-14 15:23:17 +02:00
|
|
|
}
|
2011-04-06 12:26:19 +02:00
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::cancelProcess()
|
2011-05-20 13:36:16 +02:00
|
|
|
{
|
2012-02-24 10:47:17 +01:00
|
|
|
QTC_ASSERT(d->m_profilerState, return);
|
2011-04-14 16:05:41 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
switch (d->m_profilerState->currentState()) {
|
|
|
|
case QmlProfilerStateManager::AppReadyToStop : {
|
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopped);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case QmlProfilerStateManager::AppRunning : {
|
2012-05-08 15:14:11 +02:00
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default: {
|
2012-07-27 15:43:00 +02:00
|
|
|
const QString message = QString::fromLatin1("Unexpected process termination requested with state %1 in %2:%3")
|
|
|
|
.arg(d->m_profilerState->currentStateAsString(), QString::fromLatin1(__FILE__), QString::number(__LINE__));
|
|
|
|
qWarning("%s", qPrintable(message));
|
2012-02-24 10:47:17 +01:00
|
|
|
return;
|
|
|
|
}
|
2011-04-06 12:26:19 +02:00
|
|
|
}
|
2013-07-30 14:08:01 +02:00
|
|
|
runControlFinished();
|
2011-03-11 12:22:57 +01:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::logApplicationMessage(const QString &msg, Utils::OutputFormat format)
|
2011-06-09 14:30:15 +02:00
|
|
|
{
|
2013-07-30 14:08:01 +02:00
|
|
|
appendMessage(msg, format);
|
2011-10-31 16:42:31 +01:00
|
|
|
d->m_outputParser.processOutput(msg);
|
2011-06-09 14:30:15 +02:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::wrongSetupMessageBox(const QString &errorMessage)
|
2011-04-14 17:14:26 +02:00
|
|
|
{
|
2012-01-24 15:36:40 +01:00
|
|
|
QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
|
2011-10-31 16:42:31 +01:00
|
|
|
infoBox->setIcon(QMessageBox::Critical);
|
|
|
|
infoBox->setWindowTitle(tr("Qt Creator"));
|
|
|
|
//: %1 is detailed error message
|
|
|
|
infoBox->setText(tr("Could not connect to the in-process QML debugger:\n%1")
|
|
|
|
.arg(errorMessage));
|
|
|
|
infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
|
|
|
|
infoBox->setDefaultButton(QMessageBox::Ok);
|
|
|
|
infoBox->setModal(true);
|
|
|
|
|
|
|
|
connect(infoBox, SIGNAL(finished(int)),
|
|
|
|
this, SLOT(wrongSetupMessageBoxFinished(int)));
|
|
|
|
|
|
|
|
infoBox->show();
|
2011-06-09 14:30:15 +02:00
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
// KILL
|
2012-05-08 15:14:11 +02:00
|
|
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
|
2011-10-31 16:42:31 +01:00
|
|
|
AnalyzerManager::stopTool();
|
2013-07-30 14:08:01 +02:00
|
|
|
runControlFinished();
|
2011-04-14 17:14:26 +02:00
|
|
|
}
|
2011-05-20 13:36:16 +02:00
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::wrongSetupMessageBoxFinished(int button)
|
2011-06-28 09:28:14 +02:00
|
|
|
{
|
|
|
|
if (button == QMessageBox::Help) {
|
|
|
|
Core::HelpManager *helpManager = Core::HelpManager::instance();
|
2013-01-29 15:29:55 +01:00
|
|
|
helpManager->handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
|
2012-11-26 21:18:13 +02:00
|
|
|
"#setting-up-qml-debugging"));
|
2011-06-28 09:28:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::showNonmodalWarning(const QString &warningMsg)
|
2011-07-22 15:26:40 +02:00
|
|
|
{
|
2012-01-24 15:36:40 +01:00
|
|
|
QMessageBox *noExecWarning = new QMessageBox(Core::ICore::mainWindow());
|
2011-07-22 15:26:40 +02:00
|
|
|
noExecWarning->setIcon(QMessageBox::Warning);
|
|
|
|
noExecWarning->setWindowTitle(tr("QML Profiler"));
|
2011-07-22 15:52:59 +02:00
|
|
|
noExecWarning->setText(warningMsg);
|
2011-07-22 15:26:40 +02:00
|
|
|
noExecWarning->setStandardButtons(QMessageBox::Ok);
|
|
|
|
noExecWarning->setDefaultButton(QMessageBox::Ok);
|
|
|
|
noExecWarning->setModal(false);
|
|
|
|
noExecWarning->show();
|
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::notifyRemoteSetupDone(quint16 port)
|
2011-07-28 10:38:39 +02:00
|
|
|
{
|
|
|
|
d->m_noDebugOutputTimer.stop();
|
2013-05-03 12:41:58 +02:00
|
|
|
emit processRunning(port);
|
|
|
|
}
|
2012-02-21 15:47:55 +01:00
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::processIsRunning(quint16 port)
|
2013-05-03 12:41:58 +02:00
|
|
|
{
|
|
|
|
d->m_noDebugOutputTimer.stop();
|
2012-02-21 15:47:55 +01:00
|
|
|
|
2013-08-02 16:53:48 +02:00
|
|
|
if (port > 0 && startParameters().analyzerPort != 0)
|
2012-02-21 15:47:55 +01:00
|
|
|
emit processRunning(port);
|
2013-07-19 16:13:10 +02:00
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::engineStarted()
|
2013-07-19 16:13:10 +02:00
|
|
|
{
|
|
|
|
d->m_running = true;
|
|
|
|
emit starting(this);
|
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::runControlFinished()
|
2013-07-19 16:13:10 +02:00
|
|
|
{
|
|
|
|
d->m_running = false;
|
|
|
|
emit finished();
|
2011-07-28 10:38:39 +02:00
|
|
|
}
|
|
|
|
|
2012-02-24 10:47:17 +01:00
|
|
|
////////////////////////////////////////////////////////////////
|
|
|
|
// Profiler State
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::registerProfilerStateManager( QmlProfilerStateManager *profilerState )
|
2012-02-24 10:47:17 +01:00
|
|
|
{
|
|
|
|
// disconnect old
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (d->m_profilerState)
|
2012-02-24 10:47:17 +01:00
|
|
|
disconnect(d->m_profilerState, SIGNAL(stateChanged()), this, SLOT(profilerStateChanged()));
|
|
|
|
|
|
|
|
d->m_profilerState = profilerState;
|
|
|
|
|
|
|
|
// connect
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (d->m_profilerState)
|
2012-02-24 10:47:17 +01:00
|
|
|
connect(d->m_profilerState, SIGNAL(stateChanged()), this, SLOT(profilerStateChanged()));
|
|
|
|
}
|
|
|
|
|
2013-07-30 14:08:01 +02:00
|
|
|
void QmlProfilerRunControl::profilerStateChanged()
|
2012-02-24 10:47:17 +01:00
|
|
|
{
|
|
|
|
switch (d->m_profilerState->currentState()) {
|
|
|
|
case QmlProfilerStateManager::AppReadyToStop : {
|
2013-07-19 16:13:10 +02:00
|
|
|
if (d->m_running)
|
|
|
|
cancelProcess();
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case QmlProfilerStateManager::Idle : {
|
2012-07-26 09:02:34 +02:00
|
|
|
d->m_noDebugOutputTimer.stop();
|
2012-02-24 10:47:17 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-20 13:36:16 +02:00
|
|
|
} // namespace Internal
|
|
|
|
} // namespace QmlProfiler
|