whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QPlaftormInputContextFactory to load input context in Wayland plugin 

Change-Id: Icd1d934463b550f0fcdf7d58df7c4fd1acb77ad8
Reviewed-on: http://codereview.qt-project.org/4740
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Joona Petrell 2011-09-13 11:32:41 +03:00 committed by Qt by Nokia
parent 5227ca6ffe
commit 486f1c284c
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -58,6 +58,9 @@
#include <QtGui/QSurfaceFormat>
#include <QtGui/QOpenGLContext>
#include <private/qplatforminputcontextfactory_qpa_p.h>
#include <qplatforminputcontext_qpa.h>
#ifdef QT_WAYLAND_GL_SUPPORT
#include "gl_integration/qwaylandglintegration.h"
#endif
@ -72,6 +75,8 @@ QWaylandIntegration::QWaylandIntegration()
foreach (QPlatformScreen *screen, mDisplay->screens())
screenAdded(screen);
mInputContext = QPlatformInputContextFactory::create();
}
QPlatformNativeInterface * QWaylandIntegration::nativeInterface() const
@ -139,3 +144,8 @@ QPlatformDrag *QWaylandIntegration::drag() const
{
return QWaylandDrag::instance(mDisplay);
}
QPlatformInputContext *QWaylandIntegration::inputContext() const
{
return mInputContext;
}

3
src/plugins/platforms/wayland/qwaylandintegration.h
View File

@ -70,11 +70,14 @@ public:
QPlatformDrag *drag() const;
QPlatformInputContext *inputContext() const;
private:
QPlatformFontDatabase *mFontDb;
QAbstractEventDispatcher *mEventDispatcher;
QWaylandDisplay *mDisplay;
QPlatformNativeInterface *mNativeInterface;
QPlatformInputContext *mInputContext;
};
QT_END_NAMESPACE