Mercurial > octave
changeset 28955:72f0acb1c768
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 17 Oct 2020 14:40:22 +0200 |
parents | dff830c84726 (current diff) e4f767de937a (diff) |
children | 0089f0213384 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/qt-graphics-toolkit.h Fri Sep 18 17:15:32 2020 +0200 +++ b/libgui/graphics/qt-graphics-toolkit.h Sat Oct 17 14:40:22 2020 +0200 @@ -42,7 +42,8 @@ class Object; class ObjectProxy; - class qt_graphics_toolkit : public QObject, public base_graphics_toolkit + class qt_graphics_toolkit + : public QObject, public octave::base_graphics_toolkit { Q_OBJECT