diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-26 08:34:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-26 08:34:20 +0200 |
| commit | 3d6d370db58b7b1575838d6c627f5109001ef136 (patch) | |
| tree | 82ec6ef675f8fd77204667354f92b954e2df00b4 /sources/shiboken2/tests/libsample/abstract.h | |
| parent | 54c3abd8774f479535d0b8741a3c30d1e7ee8548 (diff) | |
| parent | 45fa0715398f8d90573552eada0adf2e4eb5e763 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/shiboken2/tests/libsample/abstract.h')
| -rw-r--r-- | sources/shiboken2/tests/libsample/abstract.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/tests/libsample/abstract.h b/sources/shiboken2/tests/libsample/abstract.h index 9e7cf5a29..09906f1ee 100644 --- a/sources/shiboken2/tests/libsample/abstract.h +++ b/sources/shiboken2/tests/libsample/abstract.h @@ -74,7 +74,7 @@ public: inline int id() { return m_id; } // factory method - inline static Abstract* createObject() { return 0; } + inline static Abstract* createObject() { return nullptr; } // method that receives an Object Type inline static int getObjectId(Abstract* obj) { return obj->id(); } |