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
e5e202a9
Commit
e5e202a9
authored
Feb 28, 2011
by
Friedemann Kleint
Browse files
Debugger[CDB]: Do not set empty environment for 'Start external'.
parent
803add0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/cdb/cdbengine.cpp
View file @
e5e202a9
...
...
@@ -575,7 +575,8 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
connect
(
m_consoleStub
.
data
(),
SIGNAL
(
wrapperStopped
()),
SLOT
(
consoleStubExited
()));
m_consoleStub
->
setWorkingDirectory
(
sp
.
workingDirectory
);
m_consoleStub
->
setEnvironment
(
sp
.
environment
);
if
(
sp
.
environment
.
size
())
m_consoleStub
->
setEnvironment
(
sp
.
environment
);
if
(
!
m_consoleStub
->
start
(
sp
.
executable
,
sp
.
processArgs
))
{
*
errorMessage
=
tr
(
"The console process '%1' could not be started."
).
arg
(
sp
.
executable
);
return
false
;
...
...
@@ -738,7 +739,10 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
showMessage
(
msg
,
LogMisc
);
m_outputBuffer
.
clear
();
m_process
.
setEnvironment
(
mergeEnvironment
(
sp
.
environment
.
toStringList
(),
extensionFi
.
absolutePath
()));
const
QStringList
environment
=
sp
.
environment
.
size
()
==
0
?
QProcessEnvironment
::
systemEnvironment
().
toStringList
()
:
sp
.
environment
.
toStringList
();
m_process
.
setEnvironment
(
mergeEnvironment
(
environment
,
extensionFi
.
absolutePath
()));
if
(
!
sp
.
workingDirectory
.
isEmpty
())
m_process
.
setWorkingDirectory
(
sp
.
workingDirectory
);
...
...
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