From aaf05f5acd4d5b4fc67d7f27138e577b9b179dd0 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 24 Feb 2016 14:42:52 +0100
Subject: [PATCH] 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>
---
src/plugins/analyzerbase/AnalyzerBase.json.in | 19 -----
src/plugins/analyzerbase/analyzerbase.pro | 36 --------
src/plugins/analyzerbase/analyzerbase.qbs | 50 -----------
.../analyzerbase_dependencies.pri | 11 ---
src/plugins/analyzerbase/analyzerplugin.cpp | 80 ------------------
src/plugins/analyzerbase/analyzerplugin.h | 55 ------------
src/plugins/android/android.qbs | 1 -
src/plugins/android/android_dependencies.pri | 3 +-
src/plugins/android/androidanalyzesupport.cpp | 8 +-
.../baremetal/baremetalruncontrolfactory.cpp | 6 +-
.../clangstaticanalyzer.qbs | 2 +-
.../clangstaticanalyzer_dependencies.pri | 2 +-
.../clangstaticanalyzerdiagnostic.h | 2 +-
.../clangstaticanalyzerdiagnosticmodel.h | 2 +-
.../clangstaticanalyzerdiagnosticview.h | 2 +-
.../clangstaticanalyzerplugin.cpp | 2 +-
.../clangstaticanalyzerruncontrol.cpp | 4 +-
.../clangstaticanalyzerruncontrol.h | 2 +-
.../clangstaticanalyzerruncontrolfactory.cpp | 6 +-
.../clangstaticanalyzertool.cpp | 2 +-
.../clangstaticanalyzertool.h | 2 +-
.../clangstaticanalyzerunittests.cpp | 2 +-
src/plugins/debugger/analyzer/analyzer.pri | 31 +++++++
.../analyzer}/analyzerbase.qrc | 0
.../analyzer}/analyzerbase_global.h | 0
.../analyzer}/analyzerconstants.h | 0
.../analyzer}/analyzericons.h | 0
.../analyzer}/analyzermanager.cpp | 20 ++---
.../analyzer}/analyzermanager.h | 0
.../analyzer}/analyzerrunconfigwidget.cpp | 0
.../analyzer}/analyzerrunconfigwidget.h | 0
.../analyzer}/analyzerruncontrol.cpp | 0
.../analyzer}/analyzerruncontrol.h | 0
.../analyzer}/analyzerstartparameters.h | 0
.../analyzer}/analyzerutils.cpp | 0
.../analyzer}/analyzerutils.h | 0
.../analyzer}/detailederrorview.cpp | 0
.../analyzer}/detailederrorview.h | 0
.../analyzer}/diagnosticlocation.cpp | 0
.../analyzer}/diagnosticlocation.h | 0
.../analyzer}/ianalyzertool.cpp | 0
.../analyzer}/ianalyzertool.h | 0
.../analyzer}/images/analyzer_category.png | Bin
.../images/analyzer_overlay_small.png | Bin
.../images/analyzer_overlay_small@2x.png | Bin
.../analyzer}/images/mode_analyze.png | Bin
.../analyzer}/images/mode_analyze@2x.png | Bin
.../analyzer}/images/mode_analyze_mask.png | Bin
.../analyzer}/images/mode_analyze_mask@2x.png | Bin
.../analyzer}/startremotedialog.cpp | 0
.../analyzer}/startremotedialog.h | 0
src/plugins/debugger/debugger.pro | 1 +
src/plugins/debugger/debugger.qbs | 35 ++++++++
src/plugins/debugger/debuggerplugin.cpp | 24 ++++++
src/plugins/debugger/debuggerplugin.h | 10 ++-
src/plugins/ios/ios.qbs | 1 -
src/plugins/ios/ios_dependencies.pri | 3 +-
src/plugins/ios/iosanalyzesupport.cpp | 6 +-
src/plugins/ios/iosrunfactories.cpp | 6 +-
src/plugins/plugins.pro | 1 -
src/plugins/plugins.qbs | 1 -
src/plugins/qmlprofiler/qmlprofiler.qbs | 2 +-
.../qmlprofiler/qmlprofiler_dependencies.pri | 2 +-
src/plugins/qmlprofiler/qmlprofilerplugin.cpp | 2 +-
.../qmlprofilerrunconfigurationaspect.cpp | 2 +-
.../qmlprofiler/qmlprofilerruncontrol.cpp | 4 +-
.../qmlprofiler/qmlprofilerruncontrol.h | 2 +-
.../qmlprofilerruncontrolfactory.cpp | 8 +-
.../qmlprofiler/qmlprofilerstatisticsview.h | 2 +-
src/plugins/qmlprofiler/qmlprofilertool.cpp | 6 +-
src/plugins/qmlprofiler/qmlprofilertool.h | 4 +-
.../qmlprofiler/qmlprofilertraceview.cpp | 2 +-
.../qmlprofiler/qmlprofilerviewmanager.cpp | 2 +-
src/plugins/qnx/qnx.qbs | 1 -
src/plugins/qnx/qnx_dependencies.pri | 1 -
src/plugins/qnx/qnxanalyzesupport.cpp | 2 +-
src/plugins/qnx/qnxruncontrolfactory.cpp | 8 +-
src/plugins/remotelinux/remotelinux.qbs | 3 +-
.../remotelinux/remotelinux_dependencies.pri | 3 +-
.../remotelinux/remotelinuxanalyzesupport.cpp | 2 +-
.../remotelinuxruncontrolfactory.cpp | 8 +-
src/plugins/valgrind/callgrindengine.cpp | 2 +-
src/plugins/valgrind/callgrindtool.cpp | 6 +-
src/plugins/valgrind/callgrindtool.h | 2 +-
src/plugins/valgrind/memcheckerrorview.h | 2 +-
src/plugins/valgrind/memchecktool.cpp | 6 +-
src/plugins/valgrind/memchecktool.h | 2 +-
src/plugins/valgrind/valgrind.qbs | 1 -
.../valgrind/valgrind_dependencies.pri | 1 -
src/plugins/valgrind/valgrindengine.cpp | 4 +-
src/plugins/valgrind/valgrindengine.h | 2 +-
src/plugins/valgrind/valgrindplugin.cpp | 10 +--
src/plugins/valgrind/valgrindplugin.h | 2 +-
.../valgrind/valgrindruncontrolfactory.cpp | 6 +-
src/plugins/valgrind/valgrindrunner.h | 2 +-
.../valgrind/xmlprotocol/errorlistmodel.cpp | 2 +-
.../valgrind/xmlprotocol/errorlistmodel.h | 2 +-
.../clangstaticanalyzerautotest.qbs | 2 +-
tests/auto/valgrind/valgrindautotest.qbs | 2 +-
99 files changed, 195 insertions(+), 365 deletions(-)
delete mode 100644 src/plugins/analyzerbase/AnalyzerBase.json.in
delete mode 100644 src/plugins/analyzerbase/analyzerbase.pro
delete mode 100644 src/plugins/analyzerbase/analyzerbase.qbs
delete mode 100644 src/plugins/analyzerbase/analyzerbase_dependencies.pri
delete mode 100644 src/plugins/analyzerbase/analyzerplugin.cpp
delete mode 100644 src/plugins/analyzerbase/analyzerplugin.h
create mode 100644 src/plugins/debugger/analyzer/analyzer.pri
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerbase.qrc (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerbase_global.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerconstants.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzericons.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzermanager.cpp (97%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzermanager.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerrunconfigwidget.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerrunconfigwidget.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerruncontrol.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerruncontrol.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerstartparameters.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerutils.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/analyzerutils.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/detailederrorview.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/detailederrorview.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/diagnosticlocation.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/diagnosticlocation.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/ianalyzertool.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/ianalyzertool.h (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/analyzer_category.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/analyzer_overlay_small.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/analyzer_overlay_small@2x.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/mode_analyze.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/mode_analyze@2x.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/mode_analyze_mask.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/images/mode_analyze_mask@2x.png (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/startremotedialog.cpp (100%)
rename src/plugins/{analyzerbase => debugger/analyzer}/startremotedialog.h (100%)
diff --git a/src/plugins/analyzerbase/AnalyzerBase.json.in b/src/plugins/analyzerbase/AnalyzerBase.json.in
deleted file mode 100644
index ef169a709be..00000000000
--- a/src/plugins/analyzerbase/AnalyzerBase.json.in
+++ /dev/null
@@ -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
-}
diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro
deleted file mode 100644
index 923f59d398f..00000000000
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ /dev/null
@@ -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
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
deleted file mode 100644
index 50544dc3f82..00000000000
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ /dev/null
@@ -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" }
- }
-}
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
deleted file mode 100644
index 10c5c8b6dfb..00000000000
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-QTC_PLUGIN_NAME = AnalyzerBase
-QTC_LIB_DEPENDS += \
- cplusplus \
- extensionsystem \
- ssh \
- utils
-QTC_PLUGIN_DEPENDS += \
- coreplugin \
- projectexplorer \
- texteditor \
- cpptools
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
deleted file mode 100644
index cb4d7d1c97e..00000000000
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ /dev/null
@@ -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;
-}
diff --git a/src/plugins/analyzerbase/analyzerplugin.h b/src/plugins/analyzerbase/analyzerplugin.h
deleted file mode 100644
index af84928c90e..00000000000
--- a/src/plugins/analyzerbase/analyzerplugin.h
+++ /dev/null
@@ -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
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index caabb1d1bbf..4251bd023b8 100644
--- 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" }
diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri
index fad0a885abe..f471fb4fe91 100644
--- 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 \
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index cbdda00e212..0beade12e45 100644
--- 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>
diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
index 8f508fbdec9..0221fab3ad4 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
index ea9cedcd9d1..4c446f5c63b 100644
--- 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" }
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
index b0993923732..f907aefc616 100644
--- 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 \
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
index 6da02dfaa97..ecb5e8e94e4 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
index 9c93fb9f779..437e83ce402 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
index 392294fd861..0d5016fd7c4 100644
--- 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 {
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
index 2822e0e6a17..b11727890dc 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 061c9c71c56..5d4c1e3194d 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
index b74bfb30321..84ad1ae9fce 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index b89ea1cee55..a179e2fa1fe 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index b1a3a1e9fbe..e72f4c7cf6b 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
index 5c592810143..5f41c43a9db 100644
--- 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>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
index 12acb811a62..1c91d723aa2 100644
--- 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>
diff --git a/src/plugins/debugger/analyzer/analyzer.pri b/src/plugins/debugger/analyzer/analyzer.pri
new file mode 100644
index 00000000000..cb38aa4555e
--- /dev/null
+++ 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
diff --git a/src/plugins/analyzerbase/analyzerbase.qrc b/src/plugins/debugger/analyzer/analyzerbase.qrc
similarity index 100%
rename from src/plugins/analyzerbase/analyzerbase.qrc
rename to src/plugins/debugger/analyzer/analyzerbase.qrc
diff --git a/src/plugins/analyzerbase/analyzerbase_global.h b/src/plugins/debugger/analyzer/analyzerbase_global.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerbase_global.h
rename to src/plugins/debugger/analyzer/analyzerbase_global.h
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/debugger/analyzer/analyzerconstants.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerconstants.h
rename to src/plugins/debugger/analyzer/analyzerconstants.h
diff --git a/src/plugins/analyzerbase/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzericons.h
rename to src/plugins/debugger/analyzer/analyzericons.h
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/debugger/analyzer/analyzermanager.cpp
similarity index 97%
rename from src/plugins/analyzerbase/analyzermanager.cpp
rename to src/plugins/debugger/analyzer/analyzermanager.cpp
index c5e8fb2b2f2..e389af3d75b 100644
--- a/src/plugins/analyzerbase/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;
diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/debugger/analyzer/analyzermanager.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzermanager.h
rename to src/plugins/debugger/analyzer/analyzermanager.h
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
rename to src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerrunconfigwidget.h
rename to src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerruncontrol.cpp
rename to src/plugins/debugger/analyzer/analyzerruncontrol.cpp
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerruncontrol.h
rename to src/plugins/debugger/analyzer/analyzerruncontrol.h
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/debugger/analyzer/analyzerstartparameters.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerstartparameters.h
rename to src/plugins/debugger/analyzer/analyzerstartparameters.h
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/debugger/analyzer/analyzerutils.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerutils.cpp
rename to src/plugins/debugger/analyzer/analyzerutils.cpp
diff --git a/src/plugins/analyzerbase/analyzerutils.h b/src/plugins/debugger/analyzer/analyzerutils.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerutils.h
rename to src/plugins/debugger/analyzer/analyzerutils.h
diff --git a/src/plugins/analyzerbase/detailederrorview.cpp b/src/plugins/debugger/analyzer/detailederrorview.cpp
similarity index 100%
rename from src/plugins/analyzerbase/detailederrorview.cpp
rename to src/plugins/debugger/analyzer/detailederrorview.cpp
diff --git a/src/plugins/analyzerbase/detailederrorview.h b/src/plugins/debugger/analyzer/detailederrorview.h
similarity index 100%
rename from src/plugins/analyzerbase/detailederrorview.h
rename to src/plugins/debugger/analyzer/detailederrorview.h
diff --git a/src/plugins/analyzerbase/diagnosticlocation.cpp b/src/plugins/debugger/analyzer/diagnosticlocation.cpp
similarity index 100%
rename from src/plugins/analyzerbase/diagnosticlocation.cpp
rename to src/plugins/debugger/analyzer/diagnosticlocation.cpp
diff --git a/src/plugins/analyzerbase/diagnosticlocation.h b/src/plugins/debugger/analyzer/diagnosticlocation.h
similarity index 100%
rename from src/plugins/analyzerbase/diagnosticlocation.h
rename to src/plugins/debugger/analyzer/diagnosticlocation.h
diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/debugger/analyzer/ianalyzertool.cpp
similarity index 100%
rename from src/plugins/analyzerbase/ianalyzertool.cpp
rename to src/plugins/debugger/analyzer/ianalyzertool.cpp
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/debugger/analyzer/ianalyzertool.h
similarity index 100%
rename from src/plugins/analyzerbase/ianalyzertool.h
rename to src/plugins/debugger/analyzer/ianalyzertool.h
diff --git a/src/plugins/analyzerbase/images/analyzer_category.png b/src/plugins/debugger/analyzer/images/analyzer_category.png
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_category.png
rename to src/plugins/debugger/analyzer/images/analyzer_category.png
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_overlay_small.png
rename to src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png
rename to src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze.png b/src/plugins/debugger/analyzer/images/mode_analyze.png
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze.png
rename to src/plugins/debugger/analyzer/images/mode_analyze.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze@2x.png b/src/plugins/debugger/analyzer/images/mode_analyze@2x.png
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze@2x.png
rename to src/plugins/debugger/analyzer/images/mode_analyze@2x.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask.png b/src/plugins/debugger/analyzer/images/mode_analyze_mask.png
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze_mask.png
rename to src/plugins/debugger/analyzer/images/mode_analyze_mask.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png b/src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze_mask@2x.png
rename to src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
similarity index 100%
rename from src/plugins/analyzerbase/startremotedialog.cpp
rename to src/plugins/debugger/analyzer/startremotedialog.cpp
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/debugger/analyzer/startremotedialog.h
similarity index 100%
rename from src/plugins/analyzerbase/startremotedialog.h
rename to src/plugins/debugger/analyzer/startremotedialog.h
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index a82da0787c1..8b9fb0dc06e 100644
--- 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)
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index e97290c8cb2..a74db388bef 100644
--- 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" }
}
}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f58b3782a29..28d0950ea80 100644
--- 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;
}
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 95b1a184dfe..32ef71d1c61 100644
--- 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);
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index c9e491c3de0..0eb70f2f104 100644
--- 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"] }
diff --git a/src/plugins/ios/ios_dependencies.pri b/src/plugins/ios/ios_dependencies.pri
index c41bb270476..04ec7b6af0f 100644
--- 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
diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp
index fca1c6c8c72..c40fddf7dae 100644
--- 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>
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 17b8393174e..bd5a0dbf563 100644
--- 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>
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 569553cb4d9..c087ff2669b 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -40,7 +40,6 @@ SUBDIRS = \
bazaar \
classview \
tasklist \
- analyzerbase \
qmljstools \
macros \
remotelinux \
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 8129547efac..b86fe38a74a 100644
--- 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",
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 9b4a9359129..af55fab4fdf 100644
--- 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" }
diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
index 401f0fa51f3..e9a57c90458 100644
--- 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 \
diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
index f15d80249ec..cb5b797075d 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
index aaffb012b72..27260698fe2 100644
--- 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 {
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index 6112c6df5bd..4626072e967 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
index 18b9d3a0a70..a7d42d7c34b 100644
--- 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 {
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
index ae225bafe80..fa42f54db91 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
index 2bace1e3461..12c5445129c 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index e8520a80e4f..a36155ff570 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index 2e807f7fac4..26cda6237f3 100644
--- 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;
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 75f93ba2478..38e3b2ad41b 100644
--- 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>
diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
index 3571bfc3b78..129749274de 100644
--- 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>
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 39e9b343f3f..759c3b0d41a 100644
--- 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" }
diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri
index 8e94a8dc69d..fd104bd9f08 100644
--- 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 \
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index 58bb10462e6..e25dcd58550 100644
--- 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>
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index d0fe071a737..429a3d69407 100644
--- 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>
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 224c1cfde1f..5678b8890b7 100644
--- 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" }
}
diff --git a/src/plugins/remotelinux/remotelinux_dependencies.pri b/src/plugins/remotelinux/remotelinux_dependencies.pri
index f10e2a91ec1..2e8344d418e 100644
--- 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
diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
index 7e145a39dfa..0e88bea8736 100644
--- 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>
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 0bd402aa922..10b9ee1b71c 100644
--- 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>
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 88604c8e7fe..db1c05df12b 100644
--- 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>
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 202f664ba89..c9e4f109811 100644
--- 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>
diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h
index a210bd66ad4..0e7e97bda66 100644
--- 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 {
diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h
index 0b0f60072d7..38f92fcf46f 100644
--- 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>
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 9a089aefdaa..e4092c3af62 100644
--- 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>
diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h
index 68719f8e05f..2dd1d07b4d9 100644
--- 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>
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index b208bde9f3a..de2d53b6998 100644
--- 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" }
diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri
index ac93ce7ad0b..d962e94d6a3 100644
--- 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 \
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 78da2c58df4..12c2215c407 100644
--- 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>
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index 029cc4b5c4f..302f3a7bdb4 100644
--- 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>
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 678b24a0906..b770385fc8d 100644
--- 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>
diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h
index cbf076c38ed..f1fea5a79a9 100644
--- 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 {
diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
index f0fe4f9d372..009ec6d63e6 100644
--- 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>
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index 6870c4c0882..637f436ad09 100644
--- 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>
diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
index 5f2f5001836..c625a58920a 100644
--- 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>
diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
index 7b7cc189dde..9db79252b3c 100644
--- 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>
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
index 2baf9b8c7fd..7ae782956fa 100644
--- 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"
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 095c0e6cc59..7e7760bd396 100644
--- 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" }
--
GitLab