Skip to content
GitLab
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
ad95e337
Commit
ad95e337
authored
Sep 08, 2010
by
hjk
Browse files
debugger: fix recently introduced regression with compiled dumpers.
'+' instead of '+='. Duh.
parent
7544e753
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/classicgdbengine.cpp
View file @
ad95e337
...
...
@@ -174,7 +174,8 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
QByteArray
params
;
QList
<
QByteArray
>
extraArgs
;
const
QtDumperHelper
::
TypeData
td
=
m_dumperHelper
.
typeData
(
data0
.
type
);
m_dumperHelper
.
evaluationParameters
(
data
,
td
,
QtDumperHelper
::
GdbDebugger
,
&
params
,
&
extraArgs
);
m_dumperHelper
.
evaluationParameters
(
data
,
td
,
QtDumperHelper
::
GdbDebugger
,
&
params
,
&
extraArgs
);
//int protocol = (data.iname.startsWith("watch") && data.type == "QImage") ? 3 : 2;
//int protocol = data.iname.startsWith("watch") ? 3 : 2;
...
...
@@ -198,7 +199,7 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
+
','
+
(
dumpChildren
?
'1'
:
'0'
);
foreach
(
const
QByteArray
&
ex
,
extraArgs
)
cmd
+
','
+
ex
;
cmd
+
=
','
+
ex
;
cmd
+=
')'
;
postCommand
(
cmd
,
WatchUpdate
|
NonCriticalResponse
);
...
...
src/plugins/debugger/watchutils.cpp
View file @
ad95e337
...
...
@@ -1156,10 +1156,8 @@ static inline bool isInteger(const QString &n)
}
void
QtDumperHelper
::
evaluationParameters
(
const
WatchData
&
data
,
const
TypeData
&
td
,
Debugger
debugger
,
QByteArray
*
inBuffer
,
QByteArrayList
*
extraArgsIn
)
const
const
TypeData
&
td
,
Debugger
debugger
,
QByteArray
*
inBuffer
,
QByteArrayList
*
extraArgsIn
)
const
{
enum
{
maxExtraArgCount
=
4
};
...
...
@@ -1189,10 +1187,9 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
for
(
int
i
=
0
;
i
<
count
;
i
++
)
extraArgs
.
push_back
(
evaluationSizeofTypeExpression
(
inners
.
at
(
i
),
debugger
));
}
int
extraArgCount
=
extraArgs
.
size
();
// Pad with zeros
const
int
extraPad
=
maxExtraArgCount
-
extraArgCount
;
for
(
int
i
=
0
;
i
<
extraPad
;
i
++
)
while
(
extraArgs
.
size
()
<
maxExtraArgCount
)
extraArgs
.
push_back
(
"0"
);
// in rare cases we need more or less:
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment