diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index ffd7f6ac050..813fe116658 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -109,7 +109,6 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig, DebuggerRunControl *runControl) : QObject(runControl), m_runControl(runControl), m_runner(new AndroidRunner(this, runConfig, true)), - m_debuggingType(runConfig->debuggingType()), m_gdbServerPort(5039), m_qmlPort(runConfig->debuggerAspect()->qmlDebugServerPort()) { Q_ASSERT(runConfig->debuggerAspect()->useCppDebugger() || runConfig->debuggerAspect()->useQmlDebugger()); diff --git a/src/plugins/android/androiddebugsupport.h b/src/plugins/android/androiddebugsupport.h index 790d1f25ae7..ed4048154b4 100644 --- a/src/plugins/android/androiddebugsupport.h +++ b/src/plugins/android/androiddebugsupport.h @@ -69,7 +69,6 @@ private: private: Debugger::DebuggerRunControl* m_runControl; AndroidRunner * const m_runner; - const AndroidRunConfiguration::DebuggingType m_debuggingType; const QString m_dumperLib; int m_gdbServerPort; diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index d7ea4edd37e..60f85246525 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -121,15 +121,5 @@ QString AndroidRunConfiguration::proFilePath() const return m_proFilePath; } -AndroidRunConfiguration::DebuggingType AndroidRunConfiguration::debuggingType() const -{ - if (debuggerAspect()->useCppDebugger()) { - if (debuggerAspect()->useQmlDebugger()) - return DebugCppAndQml; - return DebugCppOnly; - } - return DebugQmlOnly; -} - } // namespace Internal } // namespace Android diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index e2487915c7e..151675d2947 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -39,10 +39,8 @@ namespace Android { namespace Internal { -class AndroidDeviceConfigListModel; class AndroidDeployStep; class AndroidRunConfigurationFactory; -class AndroidToolChain; class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration { @@ -50,13 +48,6 @@ class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration friend class AndroidRunConfigurationFactory; public: - enum BaseEnvironmentBase { - CleanEnvironmentBase = 0, - SystemEnvironmentBase = 1 - }; - - enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml }; - AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); QWidget *createConfigurationWidget(); @@ -68,8 +59,6 @@ public: AndroidConfig config() const; QString proFilePath() const; - DebuggingType debuggingType() const; - const Utils::FileName gdbCmd() const; const QString remoteChannel() const; const QString dumperLib() const;