Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
472c8069
Commit
472c8069
authored
15 years ago
by
con
Browse files
Options
Downloads
Patches
Plain Diff
Move DebuggerRunControl initialization out of ::start method.
parent
648ceaed
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/debugger/debuggerrunner.cpp
+17
-17
17 additions, 17 deletions
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.h
+2
-0
2 additions, 0 deletions
src/plugins/debugger/debuggerrunner.h
with
19 additions
and
17 deletions
src/plugins/debugger/debuggerrunner.cpp
+
17
−
17
View file @
472c8069
...
...
@@ -140,39 +140,39 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
Qt
::
QueuedConnection
);
connect
(
this
,
SIGNAL
(
stopRequested
()),
m_manager
,
SLOT
(
exitDebugger
()));
}
void
DebuggerRunControl
::
start
()
{
m_running
=
true
;
ApplicationRunConfigurationPtr
rc
=
runConfiguration
().
objectCast
<
ApplicationRunConfiguration
>
();
if
(
rc
)
{
if
(
runConfiguration
)
{
// Enhance parameters by info from the project, but do not clobber
// arguments given in the dialogs
if
(
m_startParameters
->
executable
.
isEmpty
())
m_startParameters
->
executable
=
r
c
->
executable
();
m_startParameters
->
executable
=
r
unConfiguration
->
executable
();
if
(
m_startParameters
->
environment
.
empty
())
m_startParameters
->
environment
=
r
c
->
environment
().
toStringList
();
m_startParameters
->
environment
=
r
unConfiguration
->
environment
().
toStringList
();
if
(
m_startParameters
->
workingDir
.
isEmpty
())
m_startParameters
->
workingDir
=
r
c
->
workingDirectory
();
m_startParameters
->
workingDir
=
r
unConfiguration
->
workingDirectory
();
if
(
m_mode
!=
StartExternal
)
m_startParameters
->
processArgs
=
r
c
->
commandLineArguments
();
m_startParameters
->
processArgs
=
r
unConfiguration
->
commandLineArguments
();
switch
(
m_startParameters
->
toolChainType
)
{
case
ProjectExplorer
::
ToolChain
::
UNKNOWN
:
case
ProjectExplorer
::
ToolChain
::
INVALID
:
m_startParameters
->
toolChainType
=
r
c
->
toolChainType
();
m_startParameters
->
toolChainType
=
r
unConfiguration
->
toolChainType
();
break
;
default:
break
;
}
m_manager
->
setQtDumperLibraryName
(
rc
->
dumperLibrary
());
m_manager
->
setQtDumperLibraryLocations
(
rc
->
dumperLibraryLocations
());
if
(
const
ProjectExplorer
::
Project
*
project
=
rc
->
project
())
{
if
(
const
ProjectExplorer
::
Project
*
project
=
runConfiguration
->
project
())
{
m_startParameters
->
buildDir
=
project
->
buildDirectory
(
project
->
activeBuildConfiguration
());
}
m_startParameters
->
useTerminal
=
rc
->
runMode
()
==
ApplicationRunConfiguration
::
Console
;
m_startParameters
->
useTerminal
=
runConfiguration
->
runMode
()
==
ApplicationRunConfiguration
::
Console
;
m_dumperLibrary
=
runConfiguration
->
dumperLibrary
();
m_dumperLibraryLocations
=
runConfiguration
->
dumperLibraryLocations
();
}
}
void
DebuggerRunControl
::
start
()
{
m_running
=
true
;
m_manager
->
setQtDumperLibraryName
(
m_dumperLibrary
);
m_manager
->
setQtDumperLibraryLocations
(
m_dumperLibraryLocations
);
//emit addToOutputWindow(this, tr("Debugging %1").arg(m_executable));
m_manager
->
startNewDebugger
(
this
,
m_startParameters
);
...
...
This diff is collapsed.
Click to expand it.
src/plugins/debugger/debuggerrunner.h
+
2
−
0
View file @
472c8069
...
...
@@ -109,6 +109,8 @@ private:
const
QSharedPointer
<
DebuggerStartParameters
>
m_startParameters
;
DebuggerManager
*
m_manager
;
bool
m_running
;
QString
m_dumperLibrary
;
QStringList
m_dumperLibraryLocations
;
};
// A default run configuration for external executables or attaching to
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment