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

QmlProfiler: Use LocalApplicationRunConfiguration

Browse Source 
QmlProjectRunConfiguration is now derived from
LocalApplicationRunConfiguration.

Change-Id: Ieddac63ff9832771ed141c3f0aff1bcc0313f6bf
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Aurindam Jana
2013-10-11 11:32:50 +02:00
committed by hjk
parent fc0da55e1f
commit 0cf3ef5926
3 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@
#include <analyzerbase/analyzerstartparameters.h>
#include <projectexplorer/runconfiguration.h>
#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
#include <projectexplorer/localapplicationrunconfiguration.h>
#include <projectexplorer/environmentaspect.h>
@@ -47,28 +46,17 @@ LocalQmlProfilerRunner *LocalQmlProfilerRunner::createLocalRunner(
QString *errorMessage,
QmlProfilerRunControl *engine)
{
QmlProjectManager::QmlProjectRunConfiguration *rc1 =
qobject_cast<QmlProjectManager::QmlProjectRunConfiguration *>(runConfiguration);
LocalApplicationRunConfiguration *rc2 =
LocalApplicationRunConfiguration *larc =
qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration);
QTC_ASSERT(rc1 || rc2, return 0);
QTC_ASSERT(larc, return 0);
ProjectExplorer::EnvironmentAspect *environment
= runConfiguration->extraAspect<ProjectExplorer::EnvironmentAspect>();
QTC_ASSERT(environment, return 0);
Configuration conf;
if (rc1) {
// This is a "plain" .qmlproject.
conf.executable = rc1->executable();
conf.executableArguments = rc1->commandLineArguments();
conf.workingDirectory = rc1->workingDirectory();
conf.environment = environment->environment();
} else {
// FIXME: Check.
conf.executable = rc2->executable();
conf.executableArguments = rc2->commandLineArguments();
conf.workingDirectory = rc2->workingDirectory();
conf.environment = environment->environment();
}
conf.executable = larc->executable();
conf.executableArguments = larc->commandLineArguments();
conf.workingDirectory = larc->workingDirectory();
conf.environment = environment->environment();
conf.port = sp.analyzerPort;