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/plugins/platforms/linuxfb/qlinuxfbintegration.h | |
| parent | b91e6f6f40864d54903d707d7f19a9732188b670 (diff) | |
| parent | f99fe9cee9d35e1fabbf45364631f4a7f049ebe3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I99a27f9a0402e1ccad45a2d062d784f8d9a08dd3
Diffstat (limited to 'src/plugins/platforms/linuxfb/qlinuxfbintegration.h')
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 7a871b3812..af6bd1d630 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -72,7 +72,7 @@ public: QList<QPlatformScreen *> screens() const; - QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; + QFunctionPointer platformFunction(const QByteArray &function) const override; private: void createInputHandlers(); |