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
a8098cff
Commit
a8098cff
authored
Feb 25, 2010
by
Friedemann Kleint
Browse files
Trk: Do not show additional message box when canceled.
parent
486f40ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/gdbengine.cpp
View file @
a8098cff
...
...
@@ -4075,13 +4075,15 @@ void GdbEngine::handleAdapterStartFailed(const QString &msg, const QString &sett
{
setState
(
AdapterStartFailed
);
debugMessage
(
_
(
"ADAPTER START FAILED"
));
const
QString
title
=
tr
(
"Adapter start failed"
);
if
(
settingsIdHint
.
isEmpty
())
{
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
title
,
msg
);
}
else
{
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
title
,
msg
,
QString
(),
_
(
Debugger
::
Constants
::
DEBUGGER_SETTINGS_CATEGORY
),
settingsIdHint
);
if
(
!
msg
.
isEmpty
())
{
const
QString
title
=
tr
(
"Adapter start failed"
);
if
(
settingsIdHint
.
isEmpty
())
{
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
title
,
msg
);
}
else
{
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
title
,
msg
,
QString
(),
_
(
Debugger
::
Constants
::
DEBUGGER_SETTINGS_CATEGORY
),
settingsIdHint
);
}
}
shutdown
();
}
...
...
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
a8098cff
...
...
@@ -1749,7 +1749,7 @@ bool TrkGdbAdapter::initializeDevice(const QString &remoteChannel, QString *erro
case
trk
::
PromptStartCommunicationConnected
:
break
;
case
trk
::
PromptStartCommunicationCanceled
:
*
errorMessage
=
tr
(
"Canceled"
);
errorMessage
->
clear
(
);
return
false
;
case
trk
::
PromptStartCommunicationError
:
return
false
;
...
...
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