diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 18:38:12 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 12:42:10 +0000 |
| commit | 479a487066484809ebdf3c2c16b3c87c72870483 (patch) | |
| tree | ad8b7168311d5d0ab87147fea8e019f9f96ff376 /src/compositor/compositor_api/qwaylandsurface.cpp | |
| parent | 1dc17c10c314fcc67bd52a9e8e79ab45eaff7dc6 (diff) | |
Fix build without feature.im
Change-Id: Ie29b87a4198cbe34df6746b10c7a17ee1fcd608d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index f79fd57ef..a576e0d6c 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -132,7 +132,9 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate() , hasContent(false) , isInitialized(false) , contentOrientation(Qt::PrimaryOrientation) +#if QT_CONFIG(im) , inputMethodControl(Q_NULLPTR) +#endif , subsurface(0) { pending.buffer = QWaylandBufferRef(); @@ -419,7 +421,9 @@ void QWaylandSurface::initialize(QWaylandCompositor *compositor, QWaylandClient d->client = client; d->init(client->client(), id, version); d->isInitialized = true; +#if QT_CONFIG(im) d->inputMethodControl = new QWaylandInputMethodControl(this); +#endif #ifndef QT_NO_DEBUG QWaylandSurfacePrivate::removeUninitializedSurface(d); #endif @@ -665,11 +669,13 @@ bool QWaylandSurface::isCursorSurface() const return d->isCursorSurface; } +#if QT_CONFIG(im) QWaylandInputMethodControl *QWaylandSurface::inputMethodControl() const { Q_D(const QWaylandSurface); return d->inputMethodControl; } +#endif /*! * Updates the surface with the compositor's retained clipboard selection. Although |