From 8917d0be0036e0429759b7968c5f7173348c2628 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Wed, 20 Aug 2014 14:15:12 +0200 Subject: DirectFB Provide a native interface Using the same multiple inheiritance that is used in the EGLFS platform plugin. Change-Id: I016f904bfc365bec6266c3f5d638ab15ecefe63b Reviewed-by: Laszlo Agocs --- src/plugins/platforms/directfb/qdirectfbintegration.cpp | 5 +++++ src/plugins/platforms/directfb/qdirectfbintegration.h | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index b754a4aa85..fe11cbebc4 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -165,4 +165,9 @@ QPlatformServices *QDirectFbIntegration::services() const return m_services.data(); } +QPlatformNativeInterface *QDirectFbIntegration::nativeInterface() const +{ + return const_cast(this); +} + QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h index 73e1774005..eb3ff41961 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.h +++ b/src/plugins/platforms/directfb/qdirectfbintegration.h @@ -46,6 +46,7 @@ #include "qdirectfbscreen.h" #include +#include #include #include @@ -54,7 +55,7 @@ QT_BEGIN_NAMESPACE class QThread; class QAbstractEventDispatcher; -class QDirectFbIntegration : public QPlatformIntegration +class QDirectFbIntegration : public QPlatformIntegration, public QPlatformNativeInterface { public: QDirectFbIntegration(); @@ -71,6 +72,7 @@ public: QPlatformFontDatabase *fontDatabase() const; QPlatformServices *services() const; QPlatformInputContext *inputContext() const { return m_inputContext; } + QPlatformNativeInterface *nativeInterface() const; protected: virtual void initializeDirectFB(); @@ -85,7 +87,6 @@ protected: QScopedPointer m_fontDb; QScopedPointer m_services; QPlatformInputContext *m_inputContext; - }; QT_END_NAMESPACE -- cgit v1.2.3