Commit 0cf9b6e9 authored by hjk's avatar hjk

Analyzer: Move toolbar icon specification down to individual RunControls

Giving individual RunControls the freedom back to decide what they want,
even if they currrently decide to use the same one.

Change-Id: Ia2acf4b9d32d23c486339b2488611038672aba25
Reviewed-by: Ulf Hermann's avatarUlf Hermann <ulf.hermann@qt.io>
parent a8a1b3b5
......@@ -30,7 +30,6 @@
#include "clangstaticanalyzersettings.h"
#include "clangstaticanalyzerutils.h"
#include <debugger/analyzer/analyzermanager.h>
#include <debugger/analyzer/analyzerutils.h>
#include <clangcodemodel/clangutils.h>
......@@ -47,6 +46,7 @@
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h>
......@@ -76,6 +76,8 @@ ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl(
, m_filesNotAnalyzed(0)
{
setDisplayName(tr("Clang Static Analyzer"));
setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
Target *target = runConfiguration->target();
BuildConfiguration *buildConfiguration = target->activeBuildConfiguration();
QTC_ASSERT(buildConfiguration, return);
......
......@@ -24,25 +24,14 @@
**
****************************************************************************/
#include "analyzermanager.h"
#include "analyzerruncontrol.h"
#include <projectexplorer/project.h>
#include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/target.h>
#include <QDebug>
#include <QAction>
using namespace ProjectExplorer;
namespace Debugger {
AnalyzerRunControl::AnalyzerRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
: RunControl(runConfiguration, runMode)
{
setIcon(Icons::ANALYZER_START_SMALL_TOOLBAR);
}
{}
} // namespace Debugger
......@@ -30,7 +30,6 @@
#include <projectexplorer/runconfiguration.h>
#include <utils/outputformat.h>
#include <utils/port.h>
namespace Debugger {
......
......@@ -31,17 +31,21 @@
#include <debugger/analyzer/analyzerstartparameters.h>
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <coreplugin/helpmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h>
#include <projectexplorer/environmentaspect.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/localapplicationruncontrol.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runnables.h>
#include <projectexplorer/target.h>
#include <qtsupport/qtsupportconstants.h>
#include <qmldebug/qmloutputparser.h>
#include <utils/qtcassert.h>
#include <QMainWindow>
#include <QMessageBox>
#include <QTimer>
......@@ -79,6 +83,8 @@ QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration,
: AnalyzerRunControl(runConfiguration, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
, d(new QmlProfilerRunControlPrivate)
{
setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
d->m_tool = tool;
// Only wait 4 seconds for the 'Waiting for connection' on application output, then just try to connect
// (application output might be redirected / blocked)
......
......@@ -36,6 +36,8 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/runconfiguration.h>
#include <QApplication>
......@@ -54,6 +56,7 @@ namespace Internal {
ValgrindRunControl::ValgrindRunControl(RunConfiguration *runConfiguration, Core::Id runMode)
: AnalyzerRunControl(runConfiguration, runMode)
{
setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
QTC_ASSERT(runConfiguration, return);
setRunnable(runConfiguration->runnable());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment