Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
0b5591ae
Commit
0b5591ae
authored
Jan 07, 2011
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger move DebuggerStartParameters into file of its own
parent
2266c8cd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
159 additions
and
102 deletions
+159
-102
src/plugins/debugger/debugger.pro
src/plugins/debugger/debugger.pro
+1
-0
src/plugins/debugger/debuggerdialogs.cpp
src/plugins/debugger/debuggerdialogs.cpp
+1
-0
src/plugins/debugger/debuggerengine.cpp
src/plugins/debugger/debuggerengine.cpp
+33
-46
src/plugins/debugger/debuggerengine.h
src/plugins/debugger/debuggerengine.h
+2
-54
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.cpp
+2
-1
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+1
-1
src/plugins/debugger/debuggerstartparameters.h
src/plugins/debugger/debuggerstartparameters.h
+119
-0
No files found.
src/plugins/debugger/debugger.pro
View file @
0b5591ae
...
...
@@ -30,6 +30,7 @@ HEADERS += breakhandler.h \
debuggermainwindow
.
h
\
debuggerplugin
.
h
\
debuggerrunner
.
h
\
debuggerstartparameters
.
h
\
debuggerstreamops
.
h
\
debuggerstringutils
.
h
\
debuggertooltip
.
h
\
...
...
src/plugins/debugger/debuggerdialogs.cpp
View file @
0b5591ae
...
...
@@ -32,6 +32,7 @@
**************************************************************************/
#include "debuggerdialogs.h"
#include "debuggerconstants.h"
#include "cdb2/cdbengine2.h"
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
0b5591ae
...
...
@@ -95,22 +95,9 @@ using namespace TextEditor;
namespace
Debugger
{
DebuggerStartParameters
::
DebuggerStartParameters
()
:
isSnapshot
(
false
),
attachPID
(
-
1
),
useTerminal
(
false
),
qmlServerAddress
(
"127.0.0.1"
),
qmlServerPort
(
0
),
useServerStartScript
(
false
),
connParams
(
SshConnectionParameters
::
NoProxy
),
toolChainType
(
ToolChain_UNKNOWN
),
startMode
(
NoStartMode
),
executableUid
(
0
)
{}
QString
DebuggerStartParameters
::
toolChainName
()
const
QString
toolChainName
(
const
DebuggerStartParameters
&
sp
)
{
return
ToolChain
::
toolChainName
(
ProjectExplorer
::
ToolChainType
(
toolChainType
));
return
ToolChain
::
toolChainName
(
ProjectExplorer
::
ToolChainType
(
sp
.
toolChainType
));
}
QDebug
operator
<<
(
QDebug
d
,
DebuggerState
state
)
...
...
@@ -138,37 +125,6 @@ QDebug operator<<(QDebug str, const DebuggerStartParameters &sp)
return
str
;
}
const
char
*
DebuggerEngine
::
stateName
(
int
s
)
{
# define SN(x) case x: return #x;
switch
(
s
)
{
SN
(
DebuggerNotReady
)
SN
(
EngineSetupRequested
)
SN
(
EngineSetupOk
)
SN
(
EngineSetupFailed
)
SN
(
EngineRunFailed
)
SN
(
InferiorSetupRequested
)
SN
(
InferiorSetupFailed
)
SN
(
EngineRunRequested
)
SN
(
InferiorRunRequested
)
SN
(
InferiorRunOk
)
SN
(
InferiorRunFailed
)
SN
(
InferiorUnrunnable
)
SN
(
InferiorStopRequested
)
SN
(
InferiorStopOk
)
SN
(
InferiorStopFailed
)
SN
(
InferiorShutdownRequested
)
SN
(
InferiorShutdownOk
)
SN
(
InferiorShutdownFailed
)
SN
(
EngineShutdownRequested
)
SN
(
EngineShutdownOk
)
SN
(
EngineShutdownFailed
)
SN
(
DebuggerFinished
)
}
return
"<unknown>"
;
# undef SN
}
///////////////////////////////////////////////////////////////////////
//
...
...
@@ -336,6 +292,37 @@ DebuggerEngine::~DebuggerEngine()
delete
d
;
}
const
char
*
DebuggerEngine
::
stateName
(
int
s
)
{
# define SN(x) case x: return #x;
switch
(
s
)
{
SN
(
DebuggerNotReady
)
SN
(
EngineSetupRequested
)
SN
(
EngineSetupOk
)
SN
(
EngineSetupFailed
)
SN
(
EngineRunFailed
)
SN
(
InferiorSetupRequested
)
SN
(
InferiorSetupFailed
)
SN
(
EngineRunRequested
)
SN
(
InferiorRunRequested
)
SN
(
InferiorRunOk
)
SN
(
InferiorRunFailed
)
SN
(
InferiorUnrunnable
)
SN
(
InferiorStopRequested
)
SN
(
InferiorStopOk
)
SN
(
InferiorStopFailed
)
SN
(
InferiorShutdownRequested
)
SN
(
InferiorShutdownOk
)
SN
(
InferiorShutdownFailed
)
SN
(
EngineShutdownRequested
)
SN
(
EngineShutdownOk
)
SN
(
EngineShutdownFailed
)
SN
(
DebuggerFinished
)
}
return
"<unknown>"
;
# undef SN
}
void
DebuggerEngine
::
showStatusMessage
(
const
QString
&
msg
,
int
timeout
)
const
{
showMessage
(
msg
,
StatusBar
,
timeout
);
...
...
src/plugins/debugger/debuggerengine.h
View file @
0b5591ae
...
...
@@ -36,12 +36,12 @@
#include "debugger_global.h"
#include "debuggerconstants.h"
#include "debuggerstartparameters.h"
#include "moduleshandler.h" // For 'Symbols'
#include "breakpoint.h" // For 'BreakpointId'
#include "stackframe.h"
#include <coreplugin/ssh/sshconnection.h>
#include <utils/environment.h>
#include <QtCore/QObject>
...
...
@@ -66,59 +66,6 @@ namespace Debugger {
class
DebuggerEnginePrivate
;
class
DebuggerRunControl
;
class
DEBUGGER_EXPORT
DebuggerStartParameters
{
public:
DebuggerStartParameters
();
QString
toolChainName
()
const
;
QString
executable
;
QString
displayName
;
QString
coreFile
;
bool
isSnapshot
;
// set if created internally
QString
processArgs
;
Utils
::
Environment
environment
;
QString
workingDirectory
;
qint64
attachPID
;
bool
useTerminal
;
// Used by AttachCrashedExternal.
QString
crashParameter
;
// Used by Qml debugging.
QString
qmlServerAddress
;
quint16
qmlServerPort
;
QString
projectBuildDir
;
QString
projectDir
;
// Used by combined cpp+qml debugging.
DebuggerEngineType
cppEngineType
;
// Used by remote debugging.
QString
remoteChannel
;
QString
remoteArchitecture
;
QString
gnuTarget
;
QString
symbolFileName
;
bool
useServerStartScript
;
QString
serverStartScript
;
QString
sysRoot
;
QByteArray
remoteDumperLib
;
QByteArray
remoteSourcesDir
;
QString
remoteMountPoint
;
QString
localMountDir
;
Core
::
SshConnectionParameters
connParams
;
QString
debuggerCommand
;
int
toolChainType
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
DebuggerStartMode
startMode
;
// For Symbian debugging.
quint32
executableUid
;
};
DEBUGGER_EXPORT
QDebug
operator
<<
(
QDebug
str
,
const
DebuggerStartParameters
&
);
DEBUGGER_EXPORT
QDebug
operator
<<
(
QDebug
str
,
DebuggerState
state
);
...
...
@@ -181,6 +128,7 @@ private:
quint64
m_address
;
};
QString
toolChainName
(
const
DebuggerStartParameters
&
sp
);
}
// namespace Internal
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
0b5591ae
...
...
@@ -1339,6 +1339,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
{
qRegisterMetaType
<
WatchData
>
(
"WatchData"
);
qRegisterMetaType
<
ContextData
>
(
"ContextData"
);
qRegisterMetaType
<
DebuggerStartParameters
>
(
"DebuggerStartParameters"
);
QTC_ASSERT
(
!
theDebuggerCore
,
/**/
);
theDebuggerCore
=
this
;
...
...
@@ -2500,7 +2501,7 @@ void DebuggerPluginPrivate::runControlStarted(DebuggerEngine *engine)
activateDebugMode
();
const
QString
message
=
tr
(
"Starting debugger '%1' for tool chain '%2'..."
)
.
arg
(
engine
->
objectName
())
.
arg
(
engine
->
startParameters
().
toolChainName
(
));
.
arg
(
toolChainName
(
engine
->
startParameters
()
));
showMessage
(
message
,
StatusBar
);
showMessage
(
m_debuggerSettings
->
dump
(),
LogDebug
);
m_snapshotHandler
->
appendSnapshot
(
engine
);
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
0b5591ae
...
...
@@ -373,7 +373,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
debuggingFinished
();
// Create Message box with possibility to go to settings.
const
QString
msg
=
tr
(
"Cannot debug '%1' (tool chain: '%2'): %3"
)
.
arg
(
sp
.
executable
,
sp
.
toolChainName
(
),
d
->
m_errorMessage
);
.
arg
(
sp
.
executable
,
toolChainName
(
sp
),
d
->
m_errorMessage
);
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
tr
(
"Warning"
),
msg
,
QString
(),
QLatin1String
(
Constants
::
DEBUGGER_SETTINGS_CATEGORY
),
d
->
m_settingsIdHint
);
...
...
src/plugins/debugger/debuggerstartparameters.h
0 → 100644
View file @
0b5591ae
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** No Commercial Usage
**
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** 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.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef DEBUGGER_DEBUGGERSTARTPARAMETERS_H
#define DEBUGGER_DEBUGGERSTARTPARAMETERS_H
#include "debugger_global.h"
#include <coreplugin/ssh/sshconnection.h>
#include <utils/environment.h>
#include <projectexplorer/toolchaintype.h>
#include <QtCore/QMetaType>
namespace
Debugger
{
// Note: This is part of the "soft interface" of the debugger plugin.
// Do not add anything that needs implementation in a .cpp file.
class
DEBUGGER_EXPORT
DebuggerStartParameters
{
public:
DebuggerStartParameters
()
:
isSnapshot
(
false
),
attachPID
(
-
1
),
useTerminal
(
false
),
qmlServerAddress
(
QLatin1String
(
"127.0.0.1"
)),
qmlServerPort
(
0
),
useServerStartScript
(
false
),
connParams
(
Core
::
SshConnectionParameters
::
NoProxy
),
toolChainType
(
ProjectExplorer
::
ToolChain_UNKNOWN
),
startMode
(
NoStartMode
),
executableUid
(
0
)
{}
QString
executable
;
QString
displayName
;
QString
coreFile
;
bool
isSnapshot
;
// Set if created internally.
QString
processArgs
;
Utils
::
Environment
environment
;
QString
workingDirectory
;
qint64
attachPID
;
bool
useTerminal
;
// Used by AttachCrashedExternal.
QString
crashParameter
;
// Used by Qml debugging.
QString
qmlServerAddress
;
quint16
qmlServerPort
;
QString
projectBuildDir
;
QString
projectDir
;
// Used by combined cpp+qml debugging.
DebuggerEngineType
cppEngineType
;
// Used by remote debugging.
QString
remoteChannel
;
QString
remoteArchitecture
;
QString
gnuTarget
;
QString
symbolFileName
;
bool
useServerStartScript
;
QString
serverStartScript
;
QString
sysRoot
;
QByteArray
remoteDumperLib
;
QByteArray
remoteSourcesDir
;
QString
remoteMountPoint
;
QString
localMountDir
;
Core
::
SshConnectionParameters
connParams
;
QString
debuggerCommand
;
int
toolChainType
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
DebuggerStartMode
startMode
;
// For Symbian debugging.
quint32
executableUid
;
};
}
// namespace Debugger
Q_DECLARE_METATYPE
(
Debugger
::
DebuggerStartParameters
)
#endif // DEBUGGER_DEBUGGERSTARTPARAMETERS_H
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