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
e5c38532
Commit
e5c38532
authored
Aug 06, 2009
by
ck
Browse files
Debugger: Fixed dumper autotests.
Recent changes to QObject and QSharedPointer broke the dumper auto tests.
parent
b6087aff
Changes
2
Hide whitespace changes
Inline
Side-by-side
share/qtcreator/gdbmacros/gdbmacros_p.h
View file @
e5c38532
...
...
@@ -117,6 +117,7 @@ public:
void
*
currentChildBeingDeleted
;
void
*
declarativeData
;
void
*
objectGuards
;
QAtomicPointer
<
void
>
sharedRefCount
;
int
*
deleteWatch
;
#endif
};
...
...
tests/auto/debugger/main.cpp
View file @
e5c38532
...
...
@@ -1868,13 +1868,13 @@ void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
QByteArray
expected
(
"value='"
);
QString
val1
=
ptr
.
isNull
()
?
"<null>"
:
valToString
(
*
ptr
.
data
());
QString
val2
=
isSimpleType
(
dummy
)
?
val1
:
""
;
const
QAtomicI
nt
*
weakAddr
;
const
QAtomicI
nt
*
strongAddr
;
const
i
nt
*
weakAddr
;
const
i
nt
*
strongAddr
;
int
weakValue
;
int
strongValue
;
if
(
!
ptr
.
isNull
())
{
weakAddr
=
&
Cheater
::
getData
(
ptr
)
->
weakref
;
strongAddr
=
&
Cheater
::
getData
(
ptr
)
->
strongref
;
weakAddr
=
reinterpret_cast
<
const
int
*>
(
&
Cheater
::
getData
(
ptr
)
->
weakref
)
;
strongAddr
=
reinterpret_cast
<
const
int
*>
(
&
Cheater
::
getData
(
ptr
)
->
strongref
)
;
weakValue
=
*
weakAddr
;
strongValue
=
*
strongAddr
;
}
else
{
...
...
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