diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 16:58:31 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 10:11:44 +0000 |
| commit | 78215d02a052ffc58cca109ef91fd531594375e9 (patch) | |
| tree | f0133e565f0f3f27448deb014d15b369b01287a2 /src/client/qwaylandintegration.cpp | |
| parent | fd310aac0486ac26076e0aea87f6f8e0ed9aa542 (diff) | |
Fix build without feature.clipboard
Change-Id: I195efecca9350cb519865f251cdee9c6e23d3592
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 78d4284bd..78a1182c6 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -45,7 +45,9 @@ #include "qwaylandinputcontext_p.h" #include "qwaylandshmbackingstore_p.h" #include "qwaylandnativeinterface_p.h" +#if QT_CONFIG(clipboard) #include "qwaylandclipboard_p.h" +#endif #include "qwaylanddnd_p.h" #include "qwaylandwindowmanagerintegration_p.h" #include "qwaylandscreen_p.h" @@ -131,8 +133,10 @@ QWaylandIntegration::QWaylandIntegration() { initializeInputDeviceIntegration(); mDisplay.reset(new QWaylandDisplay(this)); -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(clipboard) mClipboard.reset(new QWaylandClipboard(mDisplay.data())); +#endif +#if QT_CONFIG(draganddrop) mDrag.reset(new QWaylandDrag(mDisplay.data())); #endif QString icStr = QPlatformInputContextFactory::requested(); @@ -228,12 +232,14 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const return mFontDb.data(); } -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(clipboard) QPlatformClipboard *QWaylandIntegration::clipboard() const { return mClipboard.data(); } +#endif +#if QT_CONFIG(draganddrop) QPlatformDrag *QWaylandIntegration::drag() const { return mDrag.data(); |