diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 1d7db335ca1d44a4501b123f2f4eff6cf2bca063..ea8e1071376a118b361fddd8a4d1bc1eff7d2a1c 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -589,18 +589,4 @@ Internal::DebuggerEngine *DebuggerRunControl::engine() return m_engine; } -bool DebuggerRunControl::isQmlProject(RunConfiguration *config) -{ - if (!config || !config->target() || !config->target()->project()) - return false; - - QStringList projectFiles = config->target()->project()->files(ProjectExplorer::Project::ExcludeGeneratedFiles); - foreach(const QString &filename, projectFiles) { - if (filename.endsWith(".qml")) - return true; - } - - return false; -} - } // namespace Debugger diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp index a946c948f4e57c8ba8d7c6fbde080283ad4245fc..8a1aa02b0829a06531afe36fe687f0cf6cdc76bd 100644 --- a/src/plugins/debugger/debuggeruiswitcher.cpp +++ b/src/plugins/debugger/debuggeruiswitcher.cpp @@ -750,29 +750,4 @@ QList<QDockWidget* > DebuggerUISwitcher::i_mw_dockWidgets() const return d->m_dockWidgets; } -bool DebuggerUISwitcher::isCurrentProjectQmlCppBased() -{ - ProjectExplorer::Project *startupProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject(); - if (!startupProject) - return false; - - if (!startupProject->activeTarget()) - return false; - - ProjectExplorer::RunConfiguration *rc = startupProject->activeTarget()->activeRunConfiguration(); - - return DebuggerRunControl::isQmlProject(rc); -} - -bool DebuggerUISwitcher::isCurrentProjectCppBased() -{ - ProjectExplorer::Project *startupProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject(); - if (!startupProject) - return false; - const QString id = startupProject->id(); - return id == QLatin1String("GenericProjectManager.GenericProject") - || id == QLatin1String("CMakeProjectManager.CMakeProject") - || id == QLatin1String("Qt4ProjectManager.Qt4Project"); -} - } // namespace Debugger diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h index bb69ab0df7c30cd3f572aa9499790274b0a08145..8a36204c25c3bc93c0a1de46e8f63d75471e0e4e 100644 --- a/src/plugins/debugger/debuggeruiswitcher.h +++ b/src/plugins/debugger/debuggeruiswitcher.h @@ -114,9 +114,6 @@ public: Utils::FancyMainWindow *mainWindow() const; - static bool isCurrentProjectQmlCppBased(); - static bool isCurrentProjectCppBased(); - signals: // emit when user changes active languages from the menu. // Both UI and debugger startup are affected.