From e3ef095469a33364998b226a1bb0eb8d39f71922 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Mon, 18 Aug 2014 13:26:18 +0200
Subject: DirectFB Add QGenericUnixServices and inputContext

The DirectFB platform plugin was missing support for services and
inputContext.

Change-Id: I010fdcbed5e172b019b4dce79f3beea0f9c5025d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 src/plugins/platforms/directfb/qdirectfbintegration.cpp | 10 ++++++++++
 src/plugins/platforms/directfb/qdirectfbintegration.h   |  4 ++++
 2 files changed, 14 insertions(+)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 27d070b75d..b754a4aa85 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -48,6 +48,7 @@
 
 #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtPlatformSupport/private/qgenericunixservices_p.h>
 
 #include <QtGui/private/qpixmap_blitter_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
@@ -56,11 +57,13 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QThread>
 #include <QtCore/QAbstractEventDispatcher>
+#include <qpa/qplatforminputcontextfactory_p.h>
 
 QT_BEGIN_NAMESPACE
 
 QDirectFbIntegration::QDirectFbIntegration()
     : m_fontDb(new QGenericUnixFontDatabase())
+    , m_services(new QGenericUnixServices)
 {
 }
 
@@ -69,6 +72,8 @@ void QDirectFbIntegration::connectToDirectFb()
     initializeDirectFB();
     initializeScreen();
     initializeInput();
+
+    m_inputContext = QPlatformInputContextFactory::create();
 }
 
 bool QDirectFbIntegration::hasCapability(Capability cap) const
@@ -155,4 +160,9 @@ QPlatformFontDatabase *QDirectFbIntegration::fontDatabase() const
     return m_fontDb.data();
 }
 
+QPlatformServices *QDirectFbIntegration::services() const
+{
+    return m_services.data();
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index 8586f33587..73e1774005 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -69,6 +69,8 @@ public:
     QAbstractEventDispatcher *createEventDispatcher() const;
 
     QPlatformFontDatabase *fontDatabase() const;
+    QPlatformServices *services() const;
+    QPlatformInputContext *inputContext() const { return m_inputContext; }
 
 protected:
     virtual void initializeDirectFB();
@@ -81,6 +83,8 @@ protected:
     QScopedPointer<QDirectFbInput> m_input;
     QScopedPointer<QThread> m_inputRunner;
     QScopedPointer<QPlatformFontDatabase> m_fontDb;
+    QScopedPointer<QPlatformServices> m_services;
+    QPlatformInputContext *m_inputContext;
 
 };
 
-- 
cgit v1.2.3