feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge DebuggerItemManager and DebuggerItemModel data

Browse Source 
Change-Id: I400fe94316433c538f82badde12ad704d722d730
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2016-11-28 18:47:18 +01:00
parent 3fa45170b5
commit 99f2c07403
8 changed files with 727 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggeritem.cpp
View File

@@ -24,9 +24,9 @@
****************************************************************************/
#include "debuggeritem.h"
#include "debuggeritemmanager.h"
#include "debuggerkitinformation.h"
#include "debuggerkitconfigwidget.h"
#include "debuggeroptionspage.h"
#include "debuggerprotocol.h"
#include <projectexplorer/abi.h>
@@ -191,7 +191,7 @@ QString DebuggerItem::engineTypeName() const
{
switch (m_engineType) {
case NoEngineType:
return DebuggerOptionsPage::tr("Not recognized");
return DebuggerItemManager::tr("Not recognized");
case GdbEngineType:
return QLatin1String("GDB");
case CdbEngineType:
@@ -230,7 +230,7 @@ QIcon DebuggerItem::decoration() const
QString DebuggerItem::validityMessage() const
{
if (m_engineType == NoEngineType)
return DebuggerOptionsPage::tr("Could not determine debugger type");
return DebuggerItemManager::tr("Could not determine debugger type");
return QString();
}