diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 12:23:08 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-25 08:27:47 +0000 |
| commit | 84bb134397f9a48b1b5bd57d24e5c0410290e2ce (patch) | |
| tree | d88a29ec2936e2ef7ad9773c1c0137fe765d14ea /src/quick/util/qquickstate_p.h | |
| parent | 681f93c74d7d60dc1998d3124e1f59ddc0f476ee (diff) | |
Disambiguate QQuickStateActionEvent::override
Don't use override as function name, may create confusion with the
official override specifier since C++11
Rename method to QQuickStateActionEvent::mayOverride
Change-Id: I1f34ec1127cc3e7c529b7e0aa3272fbfed553fa1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quick/util/qquickstate_p.h')
| -rw-r--r-- | src/quick/util/qquickstate_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index 7d22ca9f8c..ac720f4189 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -115,7 +115,7 @@ public: virtual bool changesBindings(); virtual void clearBindings(); - virtual bool override(QQuickStateActionEvent*other); + virtual bool mayOverride(QQuickStateActionEvent*other); }; //### rename to QQuickStateChange? |