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

QmlProfiler: Pass AnalyzerRunControl to LocalQmlProfilerRunner

Browse Source 
It doesn't make much sense to require a non-exported class to be passed
to the ctor of an exported one.

Change-Id: I15463f3ec0153a71cb55ad83724ec071a504a483
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-05-27 17:25:39 +02:00
parent c422b81316
commit 3d59c99143
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@
#include "localqmlprofilerrunner.h" #include "localqmlprofilerrunner.h"
#include "qmlprofilerplugin.h" #include "qmlprofilerplugin.h"
#include "qmlprofilerruncontrol.h"
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <projectexplorer/environmentaspect.h> #include <projectexplorer/environmentaspect.h>
@@ -33,6 +32,7 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qmldebug/qmldebugcommandlinearguments.h> #include <qmldebug/qmldebugcommandlinearguments.h>
#include <debugger/analyzer/analyzerruncontrol.h>
#include <QTcpServer> #include <QTcpServer>
#include <QTemporaryFile> #include <QTemporaryFile>
@@ -65,16 +65,16 @@ Utils::Port LocalQmlProfilerRunner::findFreePort(QString &host)
} }
LocalQmlProfilerRunner::LocalQmlProfilerRunner(const Configuration &configuration, LocalQmlProfilerRunner::LocalQmlProfilerRunner(const Configuration &configuration,
QmlProfilerRunControl *engine) : Debugger::AnalyzerRunControl *engine) :
QObject(engine), QObject(engine),
m_configuration(configuration) m_configuration(configuration)
{ {
connect(&m_launcher, &ApplicationLauncher::appendMessage, connect(&m_launcher, &ApplicationLauncher::appendMessage,
this, &LocalQmlProfilerRunner::appendMessage); this, &LocalQmlProfilerRunner::appendMessage);
connect(this, &LocalQmlProfilerRunner::stopped, connect(this, &LocalQmlProfilerRunner::stopped,
engine, &QmlProfilerRunControl::notifyRemoteFinished); engine, &Debugger::AnalyzerRunControl::notifyRemoteFinished);
connect(this, &LocalQmlProfilerRunner::appendMessage, connect(this, &LocalQmlProfilerRunner::appendMessage,
engine, &QmlProfilerRunControl::appendMessage); engine, &Debugger::AnalyzerRunControl::appendMessage);
connect(engine, &Debugger::AnalyzerRunControl::starting, connect(engine, &Debugger::AnalyzerRunControl::starting,
this, &LocalQmlProfilerRunner::start); this, &LocalQmlProfilerRunner::start);
connect(engine, &RunControl::finished, connect(engine, &RunControl::finished,

8
src/plugins/qmlprofiler/localqmlprofilerrunner.h
View File

@@ -31,9 +31,12 @@
#include <projectexplorer/applicationlauncher.h> #include <projectexplorer/applicationlauncher.h>
#include <projectexplorer/runnables.h> #include <projectexplorer/runnables.h>
namespace Debugger {
class AnalyzerRunControl;
}
namespace QmlProfiler { namespace QmlProfiler {
class QmlProfilerRunControl;
class QMLPROFILER_EXPORT LocalQmlProfilerRunner : public QObject class QMLPROFILER_EXPORT LocalQmlProfilerRunner : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -45,7 +48,8 @@ public:
QString socket; QString socket;
}; };
LocalQmlProfilerRunner(const Configuration &configuration, QmlProfilerRunControl *engine); LocalQmlProfilerRunner(const Configuration &configuration,
Debugger::AnalyzerRunControl *engine);
~LocalQmlProfilerRunner(); ~LocalQmlProfilerRunner();
static Utils::Port findFreePort(QString &host); static Utils::Port findFreePort(QString &host);