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
10a6829a
Commit
10a6829a
authored
Sep 17, 2009
by
hjk
Browse files
debugger: refactorization
merge DebuggerRunControl::m_dumperLibrary{,Location} into StartParameters
parent
554f4fe6
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
10a6829a
...
...
@@ -902,16 +902,6 @@ QSharedPointer<DebuggerStartParameters> DebuggerManager::startParameters() const
return
m_startParameters
;
}
void
DebuggerManager
::
setQtDumperLibraryName
(
const
QString
&
dl
)
{
m_dumperLib
=
dl
;
}
void
DebuggerManager
::
setQtDumperLibraryLocations
(
const
QStringList
&
dl
)
{
m_dumperLibLocations
=
dl
;
}
qint64
DebuggerManager
::
inferiorPid
()
const
{
return
m_inferiorPid
;
...
...
@@ -1406,7 +1396,7 @@ QString DebuggerManager::qtDumperLibraryName() const
{
if
(
theDebuggerAction
(
UseCustomDebuggingHelperLocation
)
->
value
().
toBool
())
return
theDebuggerAction
(
CustomDebuggingHelperLocation
)
->
value
().
toString
();
return
m_dumperLib
;
return
m_
startParameters
->
dumperLib
rary
;
}
QStringList
DebuggerManager
::
qtDumperLibraryLocations
()
const
...
...
@@ -1416,7 +1406,7 @@ QStringList DebuggerManager::qtDumperLibraryLocations() const
const
QString
location
=
tr
(
"%1 (explicitly set in the Debugger Options)"
).
arg
(
customLocation
);
return
QStringList
(
location
);
}
return
m_dumperLibLocations
;
return
m_
startParameters
->
dumperLib
rary
Locations
;
}
void
DebuggerManager
::
showQtDumperLibraryWarning
(
const
QString
&
details
)
...
...
src/plugins/debugger/debuggermanager.h
View file @
10a6829a
...
...
@@ -161,6 +161,9 @@ public:
QString
remoteArchitecture
;
QString
serverStartScript
;
int
toolChainType
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
};
QDebug
operator
<<
(
QDebug
str
,
const
DebuggerStartParameters
&
);
...
...
@@ -279,9 +282,6 @@ public slots:
const
QSharedPointer
<
DebuggerStartParameters
>
&
startParameters
);
void
exitDebugger
();
void
setQtDumperLibraryName
(
const
QString
&
dl
);
// Run Control
void
setQtDumperLibraryLocations
(
const
QStringList
&
dl
);
void
setSimpleDockWidgetArrangement
();
void
setBusyCursor
(
bool
on
);
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
10a6829a
...
...
@@ -169,15 +169,15 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
}
m_startParameters
->
useTerminal
=
runConfiguration
->
runMode
()
==
ApplicationRunConfiguration
::
Console
;
m_dumperLibrary
=
runConfiguration
->
dumperLibrary
();
m_dumperLibraryLocations
=
runConfiguration
->
dumperLibraryLocations
();
m_startParameters
->
dumperLibrary
=
runConfiguration
->
dumperLibrary
();
m_startParameters
->
dumperLibraryLocations
=
runConfiguration
->
dumperLibraryLocations
();
}
void
DebuggerRunControl
::
start
()
{
m_running
=
true
;
m_manager
->
setQtDumperLibraryName
(
m_dumperLibrary
);
m_manager
->
setQtDumperLibraryLocations
(
m_dumperLibraryLocations
);
m_manager
->
startNewDebugger
(
this
,
m_startParameters
);
}
...
...
src/plugins/debugger/debuggerrunner.h
View file @
10a6829a
...
...
@@ -111,8 +111,6 @@ 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
...
...
Write
Preview
Supports
Markdown
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