diff options
author | Aurindam Jana <aurindam.jana@digia.com> | 2013-10-11 11:32:50 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2013-10-15 17:53:09 +0200 |
commit | 0cf3ef5926834d293e711c2f32433158c29049f4 (patch) | |
tree | d7b792fb59798bbaf24b50db3b1589b694a936fc /src/plugins/qmlprofiler/localqmlprofilerrunner.cpp | |
parent | fc0da55e1f116103a23876aab3098ba56ba01fa8 (diff) |
QmlProfiler: Use LocalApplicationRunConfiguration
QmlProjectRunConfiguration is now derived from
LocalApplicationRunConfiguration.
Change-Id: Ieddac63ff9832771ed141c3f0aff1bcc0313f6bf
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/qmlprofiler/localqmlprofilerrunner.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/localqmlprofilerrunner.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp index db7022f4e9..7455e4b640 100644 --- a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp +++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp @@ -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; |