forked from qt-creator/qt-creator
QmlProfiler: Pass AnalyzerRunControl to LocalQmlProfilerRunner
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:
@@ -25,7 +25,6 @@
|
||||
|
||||
#include "localqmlprofilerrunner.h"
|
||||
#include "qmlprofilerplugin.h"
|
||||
#include "qmlprofilerruncontrol.h"
|
||||
|
||||
#include <projectexplorer/runconfiguration.h>
|
||||
#include <projectexplorer/environmentaspect.h>
|
||||
@@ -33,6 +32,7 @@
|
||||
#include <projectexplorer/kitinformation.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <qmldebug/qmldebugcommandlinearguments.h>
|
||||
#include <debugger/analyzer/analyzerruncontrol.h>
|
||||
|
||||
#include <QTcpServer>
|
||||
#include <QTemporaryFile>
|
||||
@@ -65,16 +65,16 @@ Utils::Port LocalQmlProfilerRunner::findFreePort(QString &host)
|
||||
}
|
||||
|
||||
LocalQmlProfilerRunner::LocalQmlProfilerRunner(const Configuration &configuration,
|
||||
QmlProfilerRunControl *engine) :
|
||||
Debugger::AnalyzerRunControl *engine) :
|
||||
QObject(engine),
|
||||
m_configuration(configuration)
|
||||
{
|
||||
connect(&m_launcher, &ApplicationLauncher::appendMessage,
|
||||
this, &LocalQmlProfilerRunner::appendMessage);
|
||||
connect(this, &LocalQmlProfilerRunner::stopped,
|
||||
engine, &QmlProfilerRunControl::notifyRemoteFinished);
|
||||
engine, &Debugger::AnalyzerRunControl::notifyRemoteFinished);
|
||||
connect(this, &LocalQmlProfilerRunner::appendMessage,
|
||||
engine, &QmlProfilerRunControl::appendMessage);
|
||||
engine, &Debugger::AnalyzerRunControl::appendMessage);
|
||||
connect(engine, &Debugger::AnalyzerRunControl::starting,
|
||||
this, &LocalQmlProfilerRunner::start);
|
||||
connect(engine, &RunControl::finished,
|
||||
|
||||
@@ -31,9 +31,12 @@
|
||||
#include <projectexplorer/applicationlauncher.h>
|
||||
#include <projectexplorer/runnables.h>
|
||||
|
||||
namespace Debugger {
|
||||
class AnalyzerRunControl;
|
||||
}
|
||||
|
||||
namespace QmlProfiler {
|
||||
|
||||
class QmlProfilerRunControl;
|
||||
class QMLPROFILER_EXPORT LocalQmlProfilerRunner : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -45,7 +48,8 @@ public:
|
||||
QString socket;
|
||||
};
|
||||
|
||||
LocalQmlProfilerRunner(const Configuration &configuration, QmlProfilerRunControl *engine);
|
||||
LocalQmlProfilerRunner(const Configuration &configuration,
|
||||
Debugger::AnalyzerRunControl *engine);
|
||||
~LocalQmlProfilerRunner();
|
||||
|
||||
static Utils::Port findFreePort(QString &host);
|
||||
|
||||
Reference in New Issue
Block a user