summaryrefslogtreecommitdiff
path: root/src/plugins/ios/iosrunfactories.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-03-02 13:57:37 +0100
committerhjk <hjk@theqtcompany.com>2016-03-07 15:06:10 +0000
commit92e301a054ad8c07fa4656d9671689aa0fdeadd0 (patch)
tree0caeb1c392bfbd69fb51ae787de858a657a92144 /src/plugins/ios/iosrunfactories.cpp
parentc326011febcf39ee08299b66744ef6155c3b938d (diff)
downloadqt-creator-92e301a054ad8c07fa4656d9671689aa0fdeadd0.tar.gz
Debugger: Merge debug mode and analyze mode
On the user-visible side, only the 'Analyze' mode button disappears, and instead a combobox to switch between different tools in appears in the Debug mode toolbar. Internally, that's quite some re-organzition: The centralized 'Analyze mode is busy' flag is gone, allowing us to run e.g. ClangStaticAnalyzer and MemCheck in parallel. Analyzer tools and debugger now share the same mechanism to generate/load/save dock widgets. Analyzer tools now create and handle their own start/stop button when appropriate. In general, Analyzer tools can create/handle more than one run control at a time. Further consolidation is possible, e.g. RunControl state handling could be merged into the base ProjectExplorer::RunControl to avoid the still existing duplication in ~15 instances. Change-Id: I91e5940ebc4211f98056d507cf2f7b5f8efe7f07 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/ios/iosrunfactories.cpp')
-rw-r--r--src/plugins/ios/iosrunfactories.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index bd5a0dbf56..a8262b4abd 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -48,7 +48,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <coreplugin/id.h>
-using namespace Analyzer;
+using namespace Debugger;
using namespace ProjectExplorer;
using namespace QmakeProjectManager;
@@ -190,7 +190,7 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
if (mode == ProjectExplorer::Constants::NORMAL_RUN_MODE)
res = new Ios::Internal::IosRunControl(rc);
else if (mode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
- AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(runConfig, mode);
+ AnalyzerRunControl *runControl = Debugger::createAnalyzerRunControl(runConfig, mode);
QTC_ASSERT(runControl, return 0);
IDevice::ConstPtr device = DeviceKitInformation::device(target->kit());
if (device.isNull())