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 | 45fa0715398f8d90573552eada0adf2e4eb5e763 (patch) | |
| tree | 82ec6ef675f8fd77204667354f92b954e2df00b4 /sources/shiboken2/tests/libsample/virtualmethods.cpp | |
| parent | 54c3abd8774f479535d0b8741a3c30d1e7ee8548 (diff) | |
| parent | 4ccfd8de6462ce2ed938587eb0518038640c310f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I5bfa45782938d3bf43e16164f1ecd69f53bfcf8e
Diffstat (limited to 'sources/shiboken2/tests/libsample/virtualmethods.cpp')
| -rw-r--r-- | sources/shiboken2/tests/libsample/virtualmethods.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/tests/libsample/virtualmethods.cpp b/sources/shiboken2/tests/libsample/virtualmethods.cpp index 2d26bd7c8..294feca60 100644 --- a/sources/shiboken2/tests/libsample/virtualmethods.cpp +++ b/sources/shiboken2/tests/libsample/virtualmethods.cpp @@ -40,7 +40,7 @@ bool VirtualMethods::createStr(const char* text, Str*& ret) { if (!text) { - ret = 0; + ret = nullptr; return false; } |