From 7079a835a0fbef0e1b8bc43f801e52065ab34046 Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@rim.com>
Date: Fri, 25 Oct 2013 15:02:56 +0200
Subject: [PATCH] Debugger: Add new debuggers from option page
The asserts should be moved from the addDebugger() method
which is called to add an 'empty' debugger when adding new one
from the option page.
Change-Id: Ic402db514d1e97f5fdc12d9bb9070bf29b2ab354
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/debugger/debuggerkitconfigwidget.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp
index 8fbf67390a4..a3e0b611d31 100644
--- a/src/plugins/debugger/debuggerkitconfigwidget.cpp
+++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp
@@ -647,6 +647,9 @@ void DebuggerItemManager::saveDebuggers()
QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item)
{
+ QTC_ASSERT(!item.command().isEmpty(), return QVariant());
+ QTC_ASSERT(!item.displayName().isEmpty(), return QVariant());
+ QTC_ASSERT(item.engineType() != NoEngineType, return QVariant());
if (findByCommand(item.command()))
return item.id();
@@ -661,9 +664,6 @@ void DebuggerItemManager::deregisterDebugger(const DebuggerItem &item)
QVariant DebuggerItemManager::addDebugger(const DebuggerItem &item)
{
- QTC_ASSERT(!item.command().isEmpty(), return QVariant());
- QTC_ASSERT(!item.displayName().isEmpty(), return QVariant());
- QTC_ASSERT(item.engineType() != NoEngineType, return QVariant());
QTC_ASSERT(item.id().isValid(), return QVariant());
m_debuggers.append(item);
m_model->addDebugger(item);
--
GitLab