Move analyzerbase to debugger

This is the first mechanical step to execute on the 'shared pool of debugger/analyzer views' idea. Future steps would be providing infrastructure for the view pool, making all analyzer/debugger views use the pool and then re-extract a sensible base for a 'analyzer-and/or-debugger' tool plugin interface. Change-Id: I1bb392e6dd3084fc56937956bee1d6fd9530335d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-24 14:42:52 +01:00
parent 40e7e2cc6e
commit aaf05f5acd
99 changed files with 195 additions and 365 deletions
--- a/src/plugins/analyzerbase/AnalyzerBase.json.in
+++ b/src/plugins/analyzerbase/AnalyzerBase.json.in
@@ -1,19 +0,0 @@
-{
-    \"Name\" : \"AnalyzerBase\",
-    \"Version\" : \"$$QTCREATOR_VERSION\",
-    \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
-    \"Vendor\" : \"The Qt Company Ltd\",
-    \"Copyright\" : \"(C) 2016 The Qt Company Ltd\",
-    \"License\" : [ \"Commercial Usage\",
-                  \"\",
-                  \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\",
-                  \"\",
-                  \"GNU General Public License Usage\",
-                  \"\",
-                  \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
-    ],
-    \"Category\" : \"Code Analyzer\",
-    \"Description\" : \"Code Analyzer Base Plugin.\",
-    \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
-}
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ b/src/plugins/analyzerbase/analyzerbase.pro
@@ -1,36 +0,0 @@
-DEFINES += ANALYZERBASE_LIBRARY
-
-include(../../qtcreatorplugin.pri)
-
-QT += network
-
-# AnalyzerBase files
-
-SOURCES += \
-    ianalyzertool.cpp \
-    analyzerplugin.cpp \
-    analyzerruncontrol.cpp \
-    analyzermanager.cpp \
-    analyzerrunconfigwidget.cpp \
-    analyzerutils.cpp \
-    detailederrorview.cpp \
-    diagnosticlocation.cpp \
-    startremotedialog.cpp
-
-HEADERS += \
-    ianalyzertool.h \
-    analyzerbase_global.h \
-    analyzerconstants.h \
-    analyzerplugin.h \
-    analyzerruncontrol.h \
-    analyzermanager.h \
-    analyzerstartparameters.h \
-    analyzerrunconfigwidget.h \
-    analyzerutils.h \
-    detailederrorview.h \
-    diagnosticlocation.h \
-    startremotedialog.h \
-    analyzericons.h
-
-RESOURCES += \
-    analyzerbase.qrc
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -1,50 +0,0 @@
-import qbs 1.0
-
-QtcPlugin {
-    name: "AnalyzerBase"
-
-    Depends { name: "Qt.widgets" }
-    Depends { name: "Utils" }
-    Depends { name: "QtcSsh" }
-
-    Depends { name: "Core" }
-    Depends { name: "CppTools" }
-    Depends { name: "ProjectExplorer" }
-    Depends { name: "TextEditor" }
-
-    files: [
-        "analyzerbase.qrc",
-        "analyzerbase_global.h",
-        "analyzerconstants.h",
-        "analyzericons.h",
-        "analyzermanager.cpp",
-        "analyzermanager.h",
-        "analyzerplugin.cpp",
-        "analyzerplugin.h",
-        "analyzerrunconfigwidget.cpp",
-        "analyzerrunconfigwidget.h",
-        "analyzerruncontrol.cpp",
-        "analyzerruncontrol.h",
-        "analyzerstartparameters.h",
-        "analyzerutils.cpp",
-        "analyzerutils.h",
-        "detailederrorview.cpp",
-        "detailederrorview.h",
-        "diagnosticlocation.cpp",
-        "diagnosticlocation.h",
-        "ianalyzertool.cpp",
-        "ianalyzertool.h",
-        "startremotedialog.cpp",
-        "startremotedialog.h",
-    ]
-
-    Group {
-        name: "Images"
-        prefix: "images/"
-        files: ["*.png"]
-    }
-
-    Export {
-        Depends { name: "CPlusPlus" }
-    }
-}
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
@@ -1,11 +0,0 @@
-QTC_PLUGIN_NAME = AnalyzerBase
-QTC_LIB_DEPENDS += \
-    cplusplus \
-    extensionsystem \
-    ssh \
-    utils
-QTC_PLUGIN_DEPENDS += \
-    coreplugin \
-    projectexplorer \
-    texteditor \
-    cpptools
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "analyzerplugin.h"
-#include "analyzerconstants.h"
-#include "analyzermanager.h"
-
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/taskhub.h>
-
-#include <QtPlugin>
-
-using namespace Analyzer;
-using namespace Analyzer::Internal;
-
-static AnalyzerPlugin *m_instance = 0;
-
-////////////////////////////////////////////////////////////////////////
-//
-// AnalyzerPlugin
-//
-////////////////////////////////////////////////////////////////////////
-
-AnalyzerPlugin::AnalyzerPlugin()
-{
-    m_instance = this;
-}
-
-AnalyzerPlugin::~AnalyzerPlugin()
-{
-    m_instance = 0;
-}
-
-bool AnalyzerPlugin::initialize(const QStringList &arguments, QString *errorString)
-{
-    Q_UNUSED(arguments)
-    Q_UNUSED(errorString)
-
-    (void) new AnalyzerManager(this);
-
-    // Task integration.
-    //: Category under which Analyzer tasks are listed in Issues view
-    ProjectExplorer::TaskHub::addCategory(Constants::ANALYZERTASK_ID, tr("Analyzer"));
-
-    return true;
-}
-
-ExtensionSystem::IPlugin::ShutdownFlag AnalyzerPlugin::aboutToShutdown()
-{
-    AnalyzerManager::shutdown();
-    return SynchronousShutdown;
-}
-
-AnalyzerPlugin *AnalyzerPlugin::instance()
-{
-    return m_instance;
-}
--- a/src/plugins/analyzerbase/analyzerplugin.h
+++ b/src/plugins/analyzerbase/analyzerplugin.h
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#ifndef ANALYZERPLUGIN_H
-#define ANALYZERPLUGIN_H
-
-#include <extensionsystem/iplugin.h>
-
-namespace Analyzer {
-namespace Internal {
-
-class AnalyzerPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "AnalyzerBase.json")
-
-public:
-    static AnalyzerPlugin *instance();
-
-    AnalyzerPlugin();
-    virtual ~AnalyzerPlugin();
-
-    bool initialize(const QStringList &arguments, QString *errorString);
-    void extensionsInitialized() {}
-
-    ShutdownFlag aboutToShutdown();
-};
-
-} // namespace Internal
-} // namespace Analyzer
-
-#endif // ANALYZERPLUGIN_H
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -4,7 +4,6 @@ QtcPlugin {
    name: "Android"

    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
-    Depends { name: "AnalyzerBase" }
    Depends { name: "Core" }
    Depends { name: "Debugger" }
    Depends { name: "ProjectExplorer" }
--- a/src/plugins/android/android_dependencies.pri
+++ b/src/plugins/android/android_dependencies.pri
@@ -4,8 +4,7 @@ QTC_PLUGIN_DEPENDS += \
    debugger \
    projectexplorer \
    qtsupport \
-    texteditor \
-    analyzerbase
+    texteditor

 QTC_LIB_DEPENDS += \
    extensionsystem \
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -28,10 +28,10 @@
 #include "androidrunner.h"
 #include "androidmanager.h"

-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <projectexplorer/target.h>
 #include <projectexplorer/project.h>
--- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp
+++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
@@ -40,9 +40,9 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <utils/portlist.h>
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
@@ -3,7 +3,7 @@ import qbs
 QtcPlugin {
    name: "ClangStaticAnalyzer"

-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
    Depends { name: "Core" }
    Depends { name: "CppTools" }
    Depends { name: "ExtensionSystem" }
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
@@ -3,7 +3,7 @@ QTC_LIB_DEPENDS += \
    extensionsystem \
    utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
+    debugger \
    cpptools
 QTC_TEST_DEPENDS += \
    qbsprojectmanager \
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALZYERDIAGNOSTIC_H
 #define CLANGSTATICANALZYERDIAGNOSTIC_H

-#include <analyzerbase/diagnosticlocation.h>
+#include <debugger/analyzer/diagnosticlocation.h>

 #include <QList>
 #include <QMetaType>
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
@@ -29,7 +29,7 @@
 #include "clangstaticanalyzerdiagnostic.h"
 #include "clangstaticanalyzerprojectsettings.h"

-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 #include <utils/fileutils.h>
 #include <utils/treemodel.h>

--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERDIAGNOSTICVIEW_H
 #define CLANGSTATICANALYZERDIAGNOSTICVIEW_H

-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>

 namespace ClangStaticAnalyzer {
 namespace Internal {
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
@@ -35,7 +35,7 @@
 #include "clangstaticanalyzerunittests.h"
 #endif

-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -30,8 +30,8 @@
 #include "clangstaticanalyzersettings.h"
 #include "clangstaticanalyzerutils.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>

 #include <clangcodemodel/clangutils.h>

--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERRUNCONTROL_H
 #define CLANGSTATICANALYZERRUNCONTROL_H

-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <cpptools/projectinfo.h>
 #include <utils/environment.h>

--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -27,9 +27,9 @@

 #include "clangstaticanalyzerconstants.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <coreplugin/icontext.h>

--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
@@ -31,7 +31,7 @@
 #include "clangstaticanalyzerdiagnosticview.h"
 #include "clangstaticanalyzerruncontrol.h"

-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERTOOL_H
 #define CLANGSTATICANALYZERTOOL_H

-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <cpptools/projectinfo.h>

 #include <QHash>
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
@@ -29,7 +29,7 @@
 #include "clangstaticanalyzertool.h"
 #include "clangstaticanalyzerutils.h"

-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cpptoolstestcase.h>
 #include <projectexplorer/kitinformation.h>
--- a/src/plugins/debugger/analyzer/analyzer.pri
+++ b/src/plugins/debugger/analyzer/analyzer.pri
@@ -0,0 +1,31 @@
+
+QT += network
+
+# AnalyzerBase files
+
+SOURCES += \
+    $$PWD/ianalyzertool.cpp \
+    $$PWD/analyzerruncontrol.cpp \
+    $$PWD/analyzermanager.cpp \
+    $$PWD/analyzerrunconfigwidget.cpp \
+    $$PWD/analyzerutils.cpp \
+    $$PWD/detailederrorview.cpp \
+    $$PWD/diagnosticlocation.cpp \
+    $$PWD/startremotedialog.cpp
+
+HEADERS += \
+    $$PWD/ianalyzertool.h \
+    $$PWD/analyzerbase_global.h \
+    $$PWD/analyzerconstants.h \
+    $$PWD/analyzerruncontrol.h \
+    $$PWD/analyzermanager.h \
+    $$PWD/analyzerstartparameters.h \
+    $$PWD/analyzerrunconfigwidget.h \
+    $$PWD/analyzerutils.h \
+    $$PWD/detailederrorview.h \
+    $$PWD/diagnosticlocation.h \
+    $$PWD/startremotedialog.h \
+    $$PWD/analyzericons.h
+
+RESOURCES += \
+    $$PWD/analyzerbase.qrc
--- a/src/plugins/debugger/analyzer/analyzerbase.qrc
+++ b/src/plugins/debugger/analyzer/analyzerbase.qrc
--- a/src/plugins/debugger/analyzer/analyzerbase_global.h
+++ b/src/plugins/debugger/analyzer/analyzerbase_global.h
--- a/src/plugins/debugger/analyzer/analyzerconstants.h
+++ b/src/plugins/debugger/analyzer/analyzerconstants.h
--- a/src/plugins/debugger/analyzer/analyzericons.h
+++ b/src/plugins/debugger/analyzer/analyzericons.h
--- a/src/plugins/debugger/analyzer/analyzermanager.cpp
+++ b/src/plugins/debugger/analyzer/analyzermanager.cpp
@@ -27,10 +27,11 @@
 #include "analyzermanager.h"

 #include "analyzericons.h"
-#include "analyzerplugin.h"
 #include "analyzerstartparameters.h"
 #include "ianalyzertool.h"

+#include "../debuggerplugin.h"
+
 #include <coreplugin/coreicons.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
@@ -77,7 +78,6 @@
 using namespace Core;
 using namespace Utils;
 using namespace Core::Constants;
-using namespace Analyzer::Internal;
 using namespace Analyzer::Constants;
 using namespace ProjectExplorer;

@@ -161,7 +161,7 @@ public:

 public:
    AnalyzerManager *q;
-    AnalyzerMode *m_mode;
+    Internal::AnalyzerMode *m_mode;
    bool m_isRunning;
    FancyMainWindow *m_mainWindow;
    AnalyzerAction *m_currentAction;
@@ -259,7 +259,7 @@ void AnalyzerManagerPrivate::delayedInit()
    if (m_mode)
        return;

-    m_mode = new AnalyzerMode(q);
+    m_mode = new Internal::AnalyzerMode(q);
    createModeMainWindow();

    connect(ModeManager::instance(), &ModeManager::currentModeChanged,
@@ -286,7 +286,7 @@ void AnalyzerManagerPrivate::delayedInit()
    ICore::addContextObject(modeContextObject);
    m_mode->setWidget(splitter);

-    AnalyzerPlugin::instance()->addAutoReleasedObject(m_mode);
+    Debugger::Internal::DebuggerPlugin::instance()->addAutoReleasedObject(m_mode);

    // Populate Windows->Views menu with standard actions.
    Context analyzerContext(C_ANALYZEMODE);
@@ -444,8 +444,8 @@ void AnalyzerManagerPrivate::selectSavedTool()
 {
    const QSettings *settings = ICore::settings();

-    if (settings->contains(QLatin1String(LAST_ACTIVE_TOOL))) {
-        const Id lastAction = Id::fromSetting(settings->value(QLatin1String(LAST_ACTIVE_TOOL)));
+    if (settings->contains(QLatin1String(Internal::LAST_ACTIVE_TOOL))) {
+        const Id lastAction = Id::fromSetting(settings->value(QLatin1String(Internal::LAST_ACTIVE_TOOL)));
        foreach (AnalyzerAction *action, m_actions) {
            if (action->toolId() == lastAction) {
                selectAction(action);
@@ -497,7 +497,7 @@ void AnalyzerManagerPrivate::selectAction(AnalyzerAction *action)
        m_statusLabelsStackWidget->addWidget(toolStatusLabel);
    }
    foreach (QDockWidget *widget, m_toolWidgets.value(toolId))
-        activateDock(Qt::DockWidgetArea(widget->property(INITIAL_DOCK_AREA).toInt()), widget);
+        activateDock(Qt::DockWidgetArea(widget->property(Internal::INITIAL_DOCK_AREA).toInt()), widget);

    loadToolSettings(action->toolId());

@@ -581,7 +581,7 @@ void AnalyzerManagerPrivate::saveToolSettings(Id toolId)
    m_mainWindow->saveSettings(settings);
    settings->setValue(QLatin1String("ToolSettingsSaved"), true);
    settings->endGroup();
-    settings->setValue(QLatin1String(LAST_ACTIVE_TOOL), toolId.toString());
+    settings->setValue(QLatin1String(Internal::LAST_ACTIVE_TOOL), toolId.toString());
 }

 void AnalyzerManagerPrivate::updateRunActions()
@@ -644,7 +644,7 @@ QDockWidget *AnalyzerManager::createDockWidget(Core::Id toolId,
 {
    QTC_ASSERT(!widget->objectName().isEmpty(), return 0);
    QDockWidget *dockWidget = d->m_mainWindow->addDockForWidget(widget);
-    dockWidget->setProperty(INITIAL_DOCK_AREA, int(area));
+    dockWidget->setProperty(Internal::INITIAL_DOCK_AREA, int(area));
    d->m_dockWidgets.append(AnalyzerManagerPrivate::DockPtr(dockWidget));
    d->m_toolWidgets[toolId].push_back(dockWidget);
    return dockWidget;
--- a/src/plugins/debugger/analyzer/analyzermanager.h
+++ b/src/plugins/debugger/analyzer/analyzermanager.h
--- a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
--- a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
--- a/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
--- a/src/plugins/debugger/analyzer/analyzerruncontrol.h
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.h
--- a/src/plugins/debugger/analyzer/analyzerstartparameters.h
+++ b/src/plugins/debugger/analyzer/analyzerstartparameters.h
--- a/src/plugins/debugger/analyzer/analyzerutils.cpp
+++ b/src/plugins/debugger/analyzer/analyzerutils.cpp
--- a/src/plugins/debugger/analyzer/analyzerutils.h
+++ b/src/plugins/debugger/analyzer/analyzerutils.h
--- a/src/plugins/debugger/analyzer/detailederrorview.cpp
+++ b/src/plugins/debugger/analyzer/detailederrorview.cpp
--- a/src/plugins/debugger/analyzer/detailederrorview.h
+++ b/src/plugins/debugger/analyzer/detailederrorview.h
--- a/src/plugins/debugger/analyzer/diagnosticlocation.cpp
+++ b/src/plugins/debugger/analyzer/diagnosticlocation.cpp
--- a/src/plugins/debugger/analyzer/diagnosticlocation.h
+++ b/src/plugins/debugger/analyzer/diagnosticlocation.h
--- a/src/plugins/debugger/analyzer/ianalyzertool.cpp
+++ b/src/plugins/debugger/analyzer/ianalyzertool.cpp
--- a/src/plugins/debugger/analyzer/ianalyzertool.h
+++ b/src/plugins/debugger/analyzer/ianalyzertool.h
--- a/src/plugins/debugger/analyzer/images/analyzer_category.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_category.png
--- a/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
--- a/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
--- a/src/plugins/debugger/analyzer/images/mode_analyze.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze.png
--- a/src/plugins/debugger/analyzer/images/mode_analyze@2x.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze@2x.png
--- a/src/plugins/debugger/analyzer/images/mode_analyze_mask.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze_mask.png
--- a/src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
--- a/src/plugins/debugger/analyzer/startremotedialog.h
+++ b/src/plugins/debugger/analyzer/startremotedialog.h
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -148,5 +148,6 @@ include(lldb/lldb.pri)
 include(qml/qml.pri)
 include(namedemangler/namedemangler.pri)
 include(console/console.pri)
+include(analyzer/analyzer.pri)

 include(shared/shared.pri)
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -195,6 +195,12 @@ QtcPlugin {
        files: ["*.png"]
    }

+    Group {
+        name: "Images/analyzer"
+        prefix: "analyzer/images/"
+        files: ["*.png"]
+    }
+
    Group {
        name: "RegistryAccess"
        condition: qbs.targetOS.contains("windows")
@@ -223,7 +229,36 @@ QtcPlugin {
        ]
    }

+    Group {
+        name: "Analyzer"
+
+        files: [
+            "analyzer/analyzerbase.qrc",
+            "analyzer/analyzerbase_global.h",
+            "analyzer/analyzerconstants.h",
+            "analyzer/analyzericons.h",
+            "analyzer/analyzermanager.cpp",
+            "analyzer/analyzermanager.h",
+            "analyzer/analyzerrunconfigwidget.cpp",
+            "analyzer/analyzerrunconfigwidget.h",
+            "analyzer/analyzerruncontrol.cpp",
+            "analyzer/analyzerruncontrol.h",
+            "analyzer/analyzerstartparameters.h",
+            "analyzer/analyzerutils.cpp",
+            "analyzer/analyzerutils.h",
+            "analyzer/detailederrorview.cpp",
+            "analyzer/detailederrorview.h",
+            "analyzer/diagnosticlocation.cpp",
+            "analyzer/diagnosticlocation.h",
+            "analyzer/ianalyzertool.cpp",
+            "analyzer/ianalyzertool.h",
+            "analyzer/startremotedialog.cpp",
+            "analyzer/startremotedialog.h",
+        ]
+    }
+
    Export {
        Depends { name: "QtcSsh" }
+        Depends { name: "CPlusPlus" }
    }
 }
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -69,6 +69,9 @@
 #include "commonoptionspage.h"
 #include "gdb/startgdbserverdialog.h"

+#include "analyzer/analyzerconstants.h"
+#include "analyzer/analyzermanager.h"
+
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
@@ -99,6 +102,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/runnables.h>
 #include <projectexplorer/session.h>
+#include <projectexplorer/taskhub.h>
 #include <projectexplorer/target.h>

 #include <texteditor/texteditor.h>
@@ -386,6 +390,9 @@ using namespace ProjectExplorer;
 using namespace TextEditor;
 using namespace Utils;

+using namespace Analyzer;
+//using namespace Analyzer::Internal;
+
 namespace CC = Core::Constants;
 namespace PE = ProjectExplorer::Constants;

@@ -3168,16 +3175,25 @@ QSharedPointer<Internal::GlobalDebuggerOptions> globalDebuggerOptions()
    is DebuggerCore, implemented in DebuggerPluginPrivate.
 */

+static DebuggerPlugin *m_instance = 0;
+
 DebuggerPlugin::DebuggerPlugin()
 {
    setObjectName(QLatin1String("DebuggerPlugin"));
    dd = new DebuggerPluginPrivate(this);
+    m_instance = this;
 }

 DebuggerPlugin::~DebuggerPlugin()
 {
    delete dd;
    dd = 0;
+    m_instance = 0;
+}
+
+DebuggerPlugin *DebuggerPlugin::instance()
+{
+    return m_instance;
 }

 bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -3198,6 +3214,13 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess

    KitManager::registerKitInformation(new DebuggerKitInformation);

+    // Ex-Analyzer stuff
+    (void) new AnalyzerManager(this);
+
+    // Task integration.
+    //: Category under which Analyzer tasks are listed in Issues view
+    ProjectExplorer::TaskHub::addCategory(Analyzer::Constants::ANALYZERTASK_ID, tr("Analyzer"));
+
    return dd->initialize(arguments, errorMessage);
 }

@@ -3205,6 +3228,7 @@ IPlugin::ShutdownFlag DebuggerPlugin::aboutToShutdown()
 {
    removeObject(this);
    dd->aboutToShutdown();
+    AnalyzerManager::shutdown();
    return SynchronousShutdown;
 }

--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -43,14 +43,16 @@ public:
    DebuggerPlugin();
    ~DebuggerPlugin();

+    static DebuggerPlugin *instance();
+
 private:
    // IPlugin implementation.
-    bool initialize(const QStringList &arguments, QString *errorMessage);
+    bool initialize(const QStringList &arguments, QString *errorMessage) override;
    QObject *remoteCommand(const QStringList &options,
                           const QString &workingDirectory,
-                           const QStringList &arguments);
-    ShutdownFlag aboutToShutdown();
-    void extensionsInitialized();
+                           const QStringList &arguments) override;
+    ShutdownFlag aboutToShutdown() override;
+    void extensionsInitialized() override;

    // Called from AppOutputPane::attachToRunControl().
    Q_SLOT void attachExternalApplication(ProjectExplorer::RunControl *rc);
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
    Depends { name: "QmakeProjectManager" }
    Depends { name: "Debugger" }
    Depends { name: "QtSupport" }
-    Depends { name: "AnalyzerBase" }
    Depends { name: "QmlDebug" }
    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }

--- a/src/plugins/ios/ios_dependencies.pri
+++ b/src/plugins/ios/ios_dependencies.pri
@@ -6,5 +6,4 @@ QTC_PLUGIN_DEPENDS += \
    coreplugin \
    debugger \
    projectexplorer \
-    qmakeprojectmanager \
-    analyzerbase
+    qmakeprojectmanager
--- a/src/plugins/ios/iosanalyzesupport.cpp
+++ b/src/plugins/ios/iosanalyzesupport.cpp
@@ -34,14 +34,14 @@
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 #include <qtsupport/qtkitinformation.h>
 #include <utils/fileutils.h>
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
 #include <utils/outputformat.h>
 #include <utils/qtcprocess.h>

--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -32,9 +32,9 @@
 #include "iosmanager.h"
 #include "iosanalyzesupport.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -40,7 +40,6 @@ SUBDIRS   = \
    bazaar \
    classview \
    tasklist \
-    analyzerbase \
    qmljstools \
    macros \
    remotelinux \
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -4,7 +4,6 @@ Project {
    name: "Plugins"

    references: [
-        "analyzerbase/analyzerbase.qbs",
        "android/android.qbs",
        "autotest/autotest.qbs",
        "autotoolsprojectmanager/autotoolsprojectmanager.qbs",
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
    Depends { name: "Timeline" }

    Depends { name: "Core" }
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
    Depends { name: "ProjectExplorer" }
    Depends { name: "QtSupport" }
    Depends { name: "TextEditor" }
--- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
@@ -7,7 +7,7 @@ QTC_LIB_DEPENDS += \
    timeline \
    utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
+    debugger \
    coreplugin \
    projectexplorer \
    qtsupport \
--- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
@@ -29,7 +29,7 @@
 #include "qmlprofilertool.h"
 #include "qmlprofilertimelinemodel.h"

-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>

--- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
@@ -28,7 +28,7 @@
 #include "qmlprofilerplugin.h"
 #include "qmlprofilerconstants.h"

-#include <analyzerbase/analyzerrunconfigwidget.h>
+#include <debugger/analyzer/analyzerrunconfigwidget.h>

 namespace QmlProfiler {
 namespace Internal {
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -28,8 +28,8 @@
 #include "localqmlprofilerrunner.h"
 #include "qmlprofilertool.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
@@ -28,7 +28,7 @@

 #include "qmlprofilerstatemanager.h"

-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <utils/outputformat.h>

 namespace QmlProfiler {
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
@@ -28,10 +28,10 @@
 #include "qmlprofilerruncontrol.h"
 #include "qmlprofilerrunconfigurationaspect.h"

-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>

 #include <debugger/debuggerrunconfigurationaspect.h>

--- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
+++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
@@ -32,7 +32,7 @@
 #include "qmlprofilereventsview.h"

 #include <qmldebug/qmlprofilereventtypes.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <utils/itemviews.h>

 #include <QStandardItemModel>
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -37,9 +37,9 @@
 #include "qmlprofilersettings.h"
 #include "qmlprofilerplugin.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <utils/fancymainwindow.h>
 #include <utils/fileinprojectfinder.h>
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -30,8 +30,8 @@
 #include "qmlprofilerconstants.h"
 #include "qmldebug/qmlprofilereventtypes.h"

-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzerruncontrol.h>

 QT_BEGIN_NAMESPACE
 class QMessageBox;
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -42,7 +42,7 @@

 #include <aggregation/aggregate.h>
 // Needed for the load&save actions in the context menu
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <coreplugin/findplaceholder.h>
 #include <utils/styledbar.h>

--- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
@@ -35,7 +35,7 @@
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 #include <utils/fancymainwindow.h>
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <extensionsystem/pluginmanager.h>

 #include <QDockWidget>
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
    Depends { name: "QmlDebug" }
    Depends { name: "Utils" }

-    Depends { name: "AnalyzerBase" }
    Depends { name: "Core" }
    Depends { name: "Debugger" }
    Depends { name: "ProjectExplorer" }
--- a/src/plugins/qnx/qnx_dependencies.pri
+++ b/src/plugins/qnx/qnx_dependencies.pri
@@ -5,7 +5,6 @@ QTC_LIB_DEPENDS += \
    qmldebug \
    utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
    coreplugin \
    debugger \
    projectexplorer \
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -29,7 +29,7 @@
 #include "qnxrunconfiguration.h"
 #include "slog2inforunner.h"

-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -37,10 +37,10 @@
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
    Depends { name: "QmlDebug" }
    Depends { name: "Utils" }

-    Depends { name: "AnalyzerBase" }
    Depends { name: "Core" }
    Depends { name: "Debugger" }
    Depends { name: "ProjectExplorer" }
@@ -114,7 +113,7 @@ QtcPlugin {
    ]

    Export {
-        Depends { name: "AnalyzerBase" }
+        Depends { name: "Debugger" }
        Depends { name: "Core" }
        Depends { name: "QtcSsh" }
    }
--- a/src/plugins/remotelinux/remotelinux_dependencies.pri
+++ b/src/plugins/remotelinux/remotelinux_dependencies.pri
@@ -8,5 +8,4 @@ QTC_PLUGIN_DEPENDS += \
    coreplugin \
    debugger \
    projectexplorer \
-    qtsupport \
-    analyzerbase
+    qtsupport
--- a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
@@ -27,7 +27,7 @@

 #include "remotelinuxrunconfiguration.h"

-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>

 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -31,10 +31,10 @@
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxruncontrol.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/ianalyzertool.h>

 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -31,7 +31,7 @@
 #include <valgrind/callgrind/callgrindcontroller.h>
 #include <valgrind/callgrind/callgrindparser.h>

-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>

 #include <utils/qtcassert.h>

--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -43,9 +43,9 @@
 #include <valgrind/valgrindplugin.h>
 #include <valgrind/valgrindsettings.h>

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
+#include <debugger/analyzer/analyzerconstants.h>

 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
--- a/src/plugins/valgrind/callgrindtool.h
+++ b/src/plugins/valgrind/callgrindtool.h
@@ -26,7 +26,7 @@
 #ifndef CALLGRINDTOOL_H
 #define CALLGRINDTOOL_H

-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>

 namespace Valgrind {
 namespace Internal {
--- a/src/plugins/valgrind/memcheckerrorview.h
+++ b/src/plugins/valgrind/memcheckerrorview.h
@@ -27,7 +27,7 @@
 #ifndef MEMCHECKERRORVIEW_H
 #define MEMCHECKERRORVIEW_H

-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>

 #include <QListView>

--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -30,9 +30,9 @@
 #include "valgrindsettings.h"
 #include "valgrindplugin.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
+#include <debugger/analyzer/analyzerconstants.h>

 #include <valgrind/valgrindsettings.h>
 #include <valgrind/xmlprotocol/errorlistmodel.h>
--- a/src/plugins/valgrind/memchecktool.h
+++ b/src/plugins/valgrind/memchecktool.h
@@ -27,7 +27,7 @@
 #ifndef MEMCHECKTOOL_H
 #define MEMCHECKTOOL_H

-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>

 #include <QSortFilterProxyModel>

--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
    Depends { name: "Utils" }

    Depends { name: "Core" }
-    Depends { name: "AnalyzerBase" }
    Depends { name: "Debugger" }
    Depends { name: "ProjectExplorer" }
    Depends { name: "TextEditor" }
--- a/src/plugins/valgrind/valgrind_dependencies.pri
+++ b/src/plugins/valgrind/valgrind_dependencies.pri
@@ -5,7 +5,6 @@ QTC_LIB_DEPENDS += \
    ssh \
    utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
    coreplugin \
    debugger \
    projectexplorer \
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -28,8 +28,8 @@
 #include "valgrindsettings.h"
 #include "valgrindplugin.h"

-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerstartparameters.h>

 #include <coreplugin/icore.h>
 #include <coreplugin/ioutputpane.h>
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -27,7 +27,7 @@
 #ifndef VALGRINDENGINE_H
 #define VALGRINDENGINE_H

-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <utils/environment.h>
 #include <valgrind/valgrindrunner.h>
 #include <valgrind/valgrindsettings.h>
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -33,11 +33,11 @@
 #include "valgrindsettings.h"
 #include "valgrindconfigwidget.h"

-#include <analyzerbase/analyzericons.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/startremotedialog.h>
+#include <debugger/analyzer/analyzericons.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/startremotedialog.h>

 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
--- a/src/plugins/valgrind/valgrindplugin.h
+++ b/src/plugins/valgrind/valgrindplugin.h
@@ -28,7 +28,7 @@
 #define VALGRINDPLUGIN_H

 #include <extensionsystem/iplugin.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <projectexplorer/projectexplorer.h>

 namespace Valgrind {
--- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp
+++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
@@ -31,9 +31,9 @@
 #include "callgrindtool.h"
 #include "memchecktool.h"

-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerrunconfigwidget.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerrunconfigwidget.h>

 #include <utils/qtcassert.h>

--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -27,7 +27,7 @@
 #ifndef VALGRIND_RUNNER_H
 #define VALGRIND_RUNNER_H

-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzerconstants.h>

 #include <projectexplorer/runnables.h>

--- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
@@ -30,7 +30,7 @@
 #include "stack.h"
 #include "modelhelpers.h"

-#include <analyzerbase/diagnosticlocation.h>
+#include <debugger/analyzer/diagnosticlocation.h>
 #include <utils/qtcassert.h>

 #include <QCoreApplication>
--- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
@@ -27,7 +27,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H
 #define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H

-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 #include <utils/treemodel.h>

 #include <QSharedPointer>
--- a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
@@ -2,7 +2,7 @@ import qbs

 QtcAutotest {
    Depends { name: "Qt.widgets" }
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
    Depends { name: "Utils" }

    property path pluginDir: project.ide_source_tree + "/src/plugins/clangstaticanalyzer"
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -1,7 +1,7 @@
 import qbs

 QtcAutotest {
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
    Depends { name: "Core" }
    Depends { name: "QtcSsh" }
    Depends { name: "Utils" }