summaryrefslogtreecommitdiff
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-08-02 15:39:33 +0200
committerhjk <hjk121@nokiamail.com>2013-08-05 15:10:47 +0200
commit835ef9507b842cea670a5ceb15f6340865c594ad (patch)
treea13c8f5e8a2e05a21198483113c748d2b7886875 /src/plugins/android
parent84b479225e1b4b9487860ea68339293588f55e4a (diff)
downloadqt-creator-835ef9507b842cea670a5ceb15f6340865c594ad.tar.gz
Analyzer: Use the run mode stored in the parameters instead of a copy
Change-Id: I045622efa22bfcb26f9161556ccbbfb3df08599d Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androidanalyzesupport.cpp5
-rw-r--r--src/plugins/android/androidanalyzesupport.h2
-rw-r--r--src/plugins/android/androidrunfactories.cpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index 14dac95326..dc71f02adb 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -51,7 +51,7 @@ namespace Android {
namespace Internal {
RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfiguration *runConfig,
- RunMode runMode, QString *errorMessage)
+ RunMode runMode)
{
Target *target = runConfig->target();
AnalyzerStartParameters params;
@@ -68,8 +68,7 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati
params.startMode = StartQmlRemote;
}
- AnalyzerRunControl *analyzerRunControl =
- AnalyzerManager::createRunControl(params, runConfig, runMode);
+ AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig);
(void) new AndroidAnalyzeSupport(runConfig, analyzerRunControl);
return analyzerRunControl;
}
diff --git a/src/plugins/android/androidanalyzesupport.h b/src/plugins/android/androidanalyzesupport.h
index 2e96f3b5a1..0f0f86f4bb 100644
--- a/src/plugins/android/androidanalyzesupport.h
+++ b/src/plugins/android/androidanalyzesupport.h
@@ -48,7 +48,7 @@ class AndroidAnalyzeSupport : public AndroidRunSupport
public:
static ProjectExplorer::RunControl *createAnalyzeRunControl(AndroidRunConfiguration *runConfig,
- ProjectExplorer::RunMode runMode, QString *errorMessage);
+ ProjectExplorer::RunMode runMode);
AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
Analyzer::AnalyzerRunControl *runControl);
diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp
index 65c6237739..a76656c33a 100644
--- a/src/plugins/android/androidrunfactories.cpp
+++ b/src/plugins/android/androidrunfactories.cpp
@@ -168,7 +168,7 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
case DebugRunMode:
return AndroidDebugSupport::createDebugRunControl(rc, errorMessage);
case QmlProfilerRunMode:
- return AndroidAnalyzeSupport::createAnalyzeRunControl(rc, mode, errorMessage);
+ return AndroidAnalyzeSupport::createAnalyzeRunControl(rc, mode);
case NoRunMode:
case DebugRunModeWithBreakOnMain:
case CallgrindRunMode: