Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
905f3d6c
Commit
905f3d6c
authored
May 06, 2009
by
Oswald Buddenhagen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use explicit flag to request token substitution in gdb command instead
of searching for something which looks like one.
parent
fbe979a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
src/plugins/debugger/gdbengine.cpp
src/plugins/debugger/gdbengine.cpp
+4
-4
src/plugins/debugger/gdbengine.h
src/plugins/debugger/gdbengine.h
+2
-1
No files found.
src/plugins/debugger/gdbengine.cpp
View file @
905f3d6c
...
...
@@ -656,7 +656,7 @@ void GdbEngine::flushCommand(GdbCommand &cmd)
++
currentToken
();
m_cookieForToken
[
currentToken
()]
=
cmd
;
cmd
.
command
=
QString
::
number
(
currentToken
())
+
cmd
.
command
;
if
(
cmd
.
command
.
contains
(
__
(
"%1"
))
)
if
(
cmd
.
flags
&
EmbedToken
)
cmd
.
command
=
cmd
.
command
.
arg
(
currentToken
());
m_gdbProc
.
write
(
cmd
.
command
.
toLatin1
()
+
"
\r\n
"
);
...
...
@@ -2922,7 +2922,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
QVariant
var
;
var
.
setValue
(
data
);
execCommand
(
cmd
,
WatchUpdate
,
CB
(
handleDebuggingHelperValue1
),
var
);
execCommand
(
cmd
,
WatchUpdate
|
EmbedToken
,
CB
(
handleDebuggingHelperValue1
),
var
);
q
->
showStatusMessage
(
tr
(
"Retrieving data for watch view (%1 requests pending)..."
)
...
...
@@ -3933,7 +3933,7 @@ void GdbEngine::tryLoadDebuggingHelpers()
execCommand
(
_
(
"sharedlibrary "
)
+
dotEscape
(
lib
));
#endif
// retreive list of dumpable classes
execCommand
(
_
(
"call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"
));
execCommand
(
_
(
"call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"
)
,
EmbedToken
);
execCommand
(
_
(
"p (char*)&qDumpOutBuffer"
),
CB
(
handleQueryDebuggingHelper
));
}
...
...
@@ -3941,7 +3941,7 @@ void GdbEngine::recheckDebuggingHelperAvailability()
{
if
(
startModeAllowsDumpers
())
{
// retreive list of dumpable classes
execCommand
(
_
(
"call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"
));
execCommand
(
_
(
"call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)"
)
,
EmbedToken
);
execCommand
(
_
(
"p (char*)&qDumpOutBuffer"
),
CB
(
handleQueryDebuggingHelper
));
}
}
...
...
src/plugins/debugger/gdbengine.h
View file @
905f3d6c
...
...
@@ -147,7 +147,8 @@ public: // otherwise the Qt flag macros are unhappy
NeedsStop
=
1
,
Discardable
=
2
,
RebuildModel
=
4
,
WatchUpdate
=
Discardable
|
RebuildModel
WatchUpdate
=
Discardable
|
RebuildModel
,
EmbedToken
=
8
};
Q_DECLARE_FLAGS
(
GdbCommandFlags
,
GdbCommandFlag
)
private:
...
...
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