Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
a89643a8
Commit
a89643a8
authored
Jun 11, 2010
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: more runconfig refactoring
parent
dbdecb2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
41 deletions
+47
-41
src/plugins/debugger/debuggermanager.h
src/plugins/debugger/debuggermanager.h
+1
-38
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+2
-1
src/plugins/debugger/debuggerrunner.h
src/plugins/debugger/debuggerrunner.h
+44
-2
No files found.
src/plugins/debugger/debuggermanager.h
View file @
a89643a8
...
...
@@ -32,8 +32,7 @@
#include "debugger_global.h"
#include "debuggerconstants.h"
#include <coreplugin/ssh/sshconnection.h>
#include "debuggerrunner.h"
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
...
...
@@ -102,42 +101,6 @@ class TrkGdbAdapter;
class
BreakpointMarker
;
}
// namespace Internal
class
DEBUGGER_EXPORT
DebuggerStartParameters
{
public:
DebuggerStartParameters
();
void
clear
();
QString
executable
;
QString
displayName
;
QString
coreFile
;
QStringList
processArgs
;
QStringList
environment
;
QString
workingDirectory
;
qint64
attachPID
;
bool
useTerminal
;
QString
crashParameter
;
// for AttachCrashedExternal
// for remote debugging
QString
remoteChannel
;
QString
remoteArchitecture
;
QString
symbolFileName
;
QString
serverStartScript
;
QString
sysRoot
;
QString
debuggerCommand
;
int
toolChainType
;
QByteArray
remoteDumperLib
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
Core
::
SshServerInfo
sshserver
;
DebuggerStartMode
startMode
;
};
typedef
QSharedPointer
<
DebuggerStartParameters
>
DebuggerStartParametersPtr
;
DEBUGGER_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
DebuggerStartParameters
&
);
// Flags for initialization
enum
DebuggerEngineTypeFlags
{
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
a89643a8
...
...
@@ -28,6 +28,7 @@
**************************************************************************/
#include "debuggerrunner.h"
#include "debuggermanager.h"
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/environment.h>
...
...
@@ -183,7 +184,7 @@ void DebuggerRunControl::start()
QString
errorMessage
;
QString
settingsCategory
;
QString
settingsPage
;
if
(
m_manager
->
checkDebugConfiguration
(
startParameters
()
->
toolChainType
,
&
errorMessage
,
if
(
m_manager
->
checkDebugConfiguration
(
m_
startParameters
->
toolChainType
,
&
errorMessage
,
&
settingsCategory
,
&
settingsPage
))
{
m_manager
->
startNewDebugger
(
m_startParameters
);
emit
started
();
...
...
src/plugins/debugger/debuggerrunner.h
View file @
a89643a8
...
...
@@ -30,15 +30,58 @@
#ifndef DEBUGGERRUNNER_H
#define DEBUGGERRUNNER_H
#include "debuggermanager.h"
#include "debugger_global.h"
#include "debuggerconstants.h"
#include <coreplugin/ssh/sshconnection.h>
#include <projectexplorer/runconfiguration.h>
#include <QtCore/QStringList>
namespace
ProjectExplorer
{
class
Environment
;
}
namespace
Debugger
{
class
DebuggerManager
;
class
DEBUGGER_EXPORT
DebuggerStartParameters
{
public:
DebuggerStartParameters
();
void
clear
();
QString
executable
;
QString
displayName
;
QString
coreFile
;
QStringList
processArgs
;
QStringList
environment
;
QString
workingDirectory
;
qint64
attachPID
;
bool
useTerminal
;
QString
crashParameter
;
// for AttachCrashedExternal
// for remote debugging
QString
remoteChannel
;
QString
remoteArchitecture
;
QString
symbolFileName
;
QString
serverStartScript
;
QString
sysRoot
;
QString
debuggerCommand
;
int
toolChainType
;
QByteArray
remoteDumperLib
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
Core
::
SshServerInfo
sshserver
;
DebuggerStartMode
startMode
;
};
typedef
QSharedPointer
<
DebuggerStartParameters
>
DebuggerStartParametersPtr
;
//DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &);
namespace
Internal
{
class
DEBUGGER_EXPORT
DebuggerRunControlFactory
...
...
@@ -84,7 +127,6 @@ public:
QString
displayName
()
const
;
Q_SLOT
void
debuggingFinished
();
DebuggerStartParametersPtr
startParameters
()
{
return
m_startParameters
;
}
signals:
void
stopRequested
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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