Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
5077794f
Commit
5077794f
authored
Sep 11, 2009
by
hjk
Browse files
debugger: merge symbianengine into gdbengine
parent
a1781e07
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/gdb.pri
View file @
5077794f
...
...
@@ -16,7 +16,6 @@ SOURCES += \
$$PWD/trkutils.cpp \
$$PWD/trkclient.cpp \
$$PWD/symbianadapter.cpp \
$$PWD/symbianengine.cpp \
#$$PWD/gdboptionspage.cpp \
FORMS += $$PWD/gdboptionspage.ui
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
5077794f
...
...
@@ -4238,12 +4238,25 @@ void GdbEngine::handleFetchDisassemblerByAddress0(const GdbResultRecord &record,
}
}
IDebuggerEngine
*
createGdbEngine
(
DebuggerManager
*
parent
,
QList
<
Core
::
IOptionsPage
*>
*
opts
)
IDebuggerEngine
*
createGdbEngine
(
DebuggerManager
*
parent
,
QList
<
Core
::
IOptionsPage
*>
*
opts
)
{
opts
->
push_back
(
new
GdbOptionsPage
);
return
new
GdbEngine
(
parent
,
new
GdbProcess
);
}
IDebuggerEngine
*
createSymbianEngine
(
DebuggerManager
*
parent
,
QList
<
Core
::
IOptionsPage
*>
*
opts
)
{
Q_UNUSED
(
opts
);
//opts->push_back(new GdbOptionsPage);
SymbianAdapter
*
adapter
=
new
SymbianAdapter
;
GdbEngine
*
engine
=
new
GdbEngine
(
parent
,
adapter
);
QObject
::
connect
(
adapter
,
SIGNAL
(
output
(
QString
)),
parent
,
SLOT
(
showDebuggerOutput
(
QString
)));
return
engine
;
}
}
// namespace Internal
}
// namespace Debugger
...
...
src/plugins/debugger/gdb/symbianengine.cpp
deleted
100644 → 0
View file @
a1781e07
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file 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 Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#define QT_NO_CAST_FROM_ASCII
#include
"gdbengine.h"
#include
"symbianadapter.h"
#include
"debuggermanager.h"
//#include "debuggerdialogs.h"
#include
<utils/qtcassert.h>
#include
<texteditor/itexteditor.h>
#include
<coreplugin/icore.h>
#include
<coreplugin/dialogs/ioptionspage.h>
#include
<QtCore/QDebug>
namespace
Debugger
{
namespace
Internal
{
IDebuggerEngine
*
createSymbianEngine
(
DebuggerManager
*
parent
,
QList
<
Core
::
IOptionsPage
*>
*
opts
)
{
Q_UNUSED
(
opts
);
//opts->push_back(new GdbOptionsPage);
SymbianAdapter
*
adapter
=
new
SymbianAdapter
;
GdbEngine
*
engine
=
new
GdbEngine
(
parent
,
adapter
);
QObject
::
connect
(
adapter
,
SIGNAL
(
output
(
QString
)),
parent
,
SLOT
(
showDebuggerOutput
(
QString
)));
return
engine
;
}
}
// namespace Internal
}
// namespace Debugger
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment