summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-03-21 12:53:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-02 08:29:43 +0200
commit35a51de5b494dfeefd55eba0a08411d58565a1f9 (patch)
tree11b6c0d392009a56c93784e54d05242c1a7e8296 /src
parent620f911fd8456351019bcc116f740501d88a0537 (diff)
Let EglFS pick up a platform input context if installed
Change-Id: Ia3765997682f8f90c7f7da712527beea365e01ed Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/eglfs/qeglfsintegration.cpp4
-rw-r--r--src/plugins/platforms/eglfs/qeglfsintegration.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index 8cebe16775..64e11b4e07 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -66,6 +66,8 @@
#include <QtGui/QOffscreenSurface>
#include <qpa/qplatformcursor.h>
+#include <qpa/qplatforminputcontextfactory_p.h>
+
#include "qeglfscontext.h"
#include <EGL/egl.h>
@@ -115,6 +117,8 @@ QEglFSIntegration::QEglFSIntegration()
mScreen = new QEglFSScreen(mDisplay);
screenAdded(mScreen);
+
+ mInputContext = QPlatformInputContextFactory::create();
}
QEglFSIntegration::~QEglFSIntegration()
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h
index 5427137463..bf044d6919 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.h
@@ -79,11 +79,14 @@ public:
EGLDisplay display() const { return mDisplay; }
+ QPlatformInputContext *inputContext() const { return mInputContext; }
+
private:
EGLDisplay mDisplay;
QAbstractEventDispatcher *mEventDispatcher;
QPlatformFontDatabase *mFontDb;
QPlatformScreen *mScreen;
+ QPlatformInputContext *mInputContext;
};
QT_END_NAMESPACE