diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-20 15:08:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-20 15:08:08 +0000 |
| commit | 9e38d04a3326e1ecacf547ac971fc3c39557f611 (patch) | |
| tree | 1aaf2ec9931cc15b62bea13b10e54ae768d0779c /sources | |
| parent | 86a4c81e581075b6d3e047f837c65d5b214276d4 (diff) | |
| parent | 329913c29700fbf1adbea498080e3c90689e2259 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.9" into refs/staging/5.9
Diffstat (limited to 'sources')
| -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 |