diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-20 16:06:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-20 16:07:00 +0100 |
| commit | 329913c29700fbf1adbea498080e3c90689e2259 (patch) | |
| tree | 6218ece5c689ccbec0ecbdc775965bf14652dd4d /sources/shiboken2/tests | |
| parent | d5692db3b420620e1b4968f9ef0ab88b020f0aca (diff) | |
| parent | ea66a78ea73f677a9025e1482e658409cecd7e2a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: If56adeea2f888d8bc34e202b697f735508896c84
Diffstat (limited to 'sources/shiboken2/tests')
| -rw-r--r-- | sources/shiboken2/tests/libsample/objecttype.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sources/shiboken2/tests/libsample/objecttype.h b/sources/shiboken2/tests/libsample/objecttype.h index 4d85daeff..752659488 100644 --- a/sources/shiboken2/tests/libsample/objecttype.h +++ b/sources/shiboken2/tests/libsample/objecttype.h @@ -129,7 +129,6 @@ public: void destroyCppParent() { delete m_parent; - m_parent = 0; } //Deprecated test |