Skip to content
GitLab
Menu
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
cbfd3203
Commit
cbfd3203
authored
Jun 11, 2010
by
hjk
Browse files
debugger: remove unused member and code cosmetics
parent
b7563b3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
cbfd3203
...
...
@@ -183,7 +183,7 @@ DEBUGGER_EXPORT QDebug operator<<(QDebug str, const DebuggerStartParameters &p)
nospace
<<
"executable="
<<
p
.
executable
<<
" coreFile="
<<
p
.
coreFile
<<
" processArgs="
<<
p
.
processArgs
.
join
(
sep
)
<<
" environment=<"
<<
p
.
environment
.
size
()
<<
" variables>"
<<
" workingDir="
<<
p
.
workingDirectory
<<
" buildDir="
<<
p
.
buildDirectory
<<
" workingDir="
<<
p
.
workingDirectory
<<
" attachPID="
<<
p
.
attachPID
<<
" useTerminal="
<<
p
.
useTerminal
<<
" remoteChannel="
<<
p
.
remoteChannel
<<
" remoteArchitecture="
<<
p
.
remoteArchitecture
...
...
src/plugins/debugger/debuggermanager.h
View file @
cbfd3203
...
...
@@ -113,7 +113,6 @@ public:
QStringList
processArgs
;
QStringList
environment
;
QString
workingDirectory
;
QString
buildDirectory
;
qint64
attachPID
;
bool
useTerminal
;
QString
crashParameter
;
// for AttachCrashedExternal
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
cbfd3203
...
...
@@ -45,14 +45,11 @@
#include <QtGui/QTextDocument>
using
namespace
ProjectExplorer
;
namespace
Debugger
{
namespace
Internal
{
using
ProjectExplorer
::
BuildConfiguration
;
using
ProjectExplorer
::
RunConfiguration
;
using
ProjectExplorer
::
RunControl
;
using
ProjectExplorer
::
LocalApplicationRunConfiguration
;
////////////////////////////////////////////////////////////////////////
//
// DebuggerRunControlFactory
...
...
@@ -89,26 +86,13 @@ static DebuggerStartParametersPtr localStartParameters(RunConfiguration *runConf
sp
->
environment
=
rc
->
environment
().
toStringList
();
sp
->
workingDirectory
=
rc
->
workingDirectory
();
sp
->
processArgs
=
rc
->
commandLineArguments
();
switch
(
sp
->
toolChainType
)
{
case
ProjectExplorer
::
ToolChain
::
UNKNOWN
:
case
ProjectExplorer
::
ToolChain
::
INVALID
:
sp
->
toolChainType
=
rc
->
toolChainType
();
break
;
default:
break
;
}
if
(
rc
->
target
()
->
project
())
{
BuildConfiguration
*
bc
=
rc
->
target
()
->
activeBuildConfiguration
();
if
(
bc
)
sp
->
buildDirectory
=
bc
->
buildDirectory
();
}
sp
->
toolChainType
=
rc
->
toolChainType
();
sp
->
useTerminal
=
rc
->
runMode
()
==
LocalApplicationRunConfiguration
::
Console
;
sp
->
dumperLibrary
=
rc
->
dumperLibrary
();
sp
->
dumperLibraryLocations
=
rc
->
dumperLibraryLocations
();
QStr
in
g
q
makePath
=
ProjectExplorer
::
DebuggingHelperLibrary
::
findSystemQt
(
rc
->
environment
());
// F
in
d
q
tInstallPath.
QString
qmakePath
=
DebuggingHelperLibrary
::
findSystemQt
(
rc
->
environment
());
if
(
!
qmakePath
.
isEmpty
())
{
QProcess
proc
;
QStringList
args
;
...
...
@@ -153,7 +137,7 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget(RunConfiguration *
DebuggerRunControl
::
DebuggerRunControl
(
DebuggerManager
*
manager
,
const
DebuggerStartParametersPtr
&
startParameters
,
ProjectExplorer
::
RunConfiguration
*
runConfiguration
)
RunConfiguration
*
runConfiguration
)
:
RunControl
(
runConfiguration
,
ProjectExplorer
::
Constants
::
DEBUGMODE
),
m_startParameters
(
startParameters
),
m_manager
(
manager
),
...
...
@@ -162,7 +146,7 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
init
();
if
(
m_startParameters
->
environment
.
empty
())
m_startParameters
->
environment
=
ProjectExplorer
::
Environment
().
toStringList
();
m_startParameters
->
environment
=
ProjectExplorer
::
Environment
().
toStringList
();
m_startParameters
->
useTerminal
=
false
;
}
...
...
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