diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:30 +0200 |
commit | 567a7196fdb37312a90e07c05b46e1e5e5bcc1c2 (patch) | |
tree | bc785eca5697d7b32415cf8f030adf7c37652a27 /sources/shiboken2/tests | |
parent | fafd06df5f87f13df7136cc903f4d7e094510325 (diff) | |
parent | 3d34fd298735ba352d0b6e48a7778f8820a9ddc2 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie8025300580981c5349b31d4846a7f659481991d
Diffstat (limited to 'sources/shiboken2/tests')
-rw-r--r-- | sources/shiboken2/tests/libother/otherderived.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/tests/libother/otherderived.h b/sources/shiboken2/tests/libother/otherderived.h index dfb219e1d..72e1e2302 100644 --- a/sources/shiboken2/tests/libother/otherderived.h +++ b/sources/shiboken2/tests/libother/otherderived.h @@ -55,7 +55,7 @@ public: // factory method static Abstract* createObject(); - void hideFunction(HideType*) {} + void hideFunction(HideType*) override {} protected: inline const char* getClassName() { return className(); } |