diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-03 01:00:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-03 01:00:11 +0200 |
| commit | 682513bed4401fbc5f8fbaf52752565dbdb0fd03 (patch) | |
| tree | 130a1eb852a1e596a76608193be86cd08bf3c57d /src/tools/uic | |
| parent | b91e6f6f40864d54903d707d7f19a9732188b670 (diff) | |
| parent | f99fe9cee9d35e1fabbf45364631f4a7f049ebe3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I99a27f9a0402e1ccad45a2d062d784f8d9a08dd3
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 7f03849798..e9247f4cc4 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -58,9 +58,9 @@ struct WriteIncludes : public TreeWalker // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // custom widgets |