diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:47 +0200 |
| commit | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (patch) | |
| tree | b26f1bb7a9639f2b2a875c0cb2b937858b700add /sources/shiboken2/tests/libsample/abstract.h | |
| parent | ffd068caf7063799e0196602e31ca7b1781c3f97 (diff) | |
| parent | 75f824b13a2ef12a9a5a33db19216b4e43a72922 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I389468b76913ac3c8113ab89833c756a7a72e54f
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(); } |