diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-18 14:20:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-18 14:20:10 +0100 |
| commit | bbfaf03b5355031ce399b6d3ae82506cbe2f3d1d (patch) | |
| tree | 41683d420c35d8c7d9aa957fac753e192e60d8e7 /src/plugins/platforms/linuxfb/qlinuxfbintegration.h | |
| parent | cbece1e8c471322b0650dfb2a3f7b2258ff4c1c9 (diff) | |
| parent | 69196b38c481610ef30bfe8ce8e7ba6826729ab8 (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I400eb311c5c7f821ddbf3a52e5b101e7a8d50e20
Diffstat (limited to 'src/plugins/platforms/linuxfb/qlinuxfbintegration.h')
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index cabd943921..83446105f8 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -35,6 +35,7 @@ #define QLINUXFBINTEGRATION_H #include <qpa/qplatformintegration.h> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE @@ -60,6 +61,8 @@ public: QPlatformServices *services() const Q_DECL_OVERRIDE; QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; } + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + QList<QPlatformScreen *> screens() const; private: @@ -68,6 +71,7 @@ private: QScopedPointer<QPlatformFontDatabase> m_fontDb; QScopedPointer<QPlatformServices> m_services; QScopedPointer<QFbVtHandler> m_vtHandler; + QScopedPointer<QPlatformNativeInterface> m_nativeInterface; }; QT_END_NAMESPACE |