diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:48:57 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:50:29 +0100 |
| commit | 7321747048a99626acbe054d34c3d364bfa73bcc (patch) | |
| tree | 6f1905886dfed35dbba512b011bd39e18b1497ff /src/client/qwaylandintegration.cpp | |
| parent | 59965ed2277bb62e0ec38b149b570285828660fd (diff) | |
| parent | c76a1716a3e51a9fac78377890ea0161a9658344 (diff) | |
Merge remote-tracking branch 'qt/5.7' into 5.8
Change-Id: Ibfe6fe6ed983b537d55544883b7dc75e5cc3fc37
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 3e2630610..32b4b8953 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -131,9 +131,10 @@ QWaylandIntegration::QWaylandIntegration() { initializeInputDeviceIntegration(); mDisplay.reset(new QWaylandDisplay(this)); +#ifndef QT_NO_DRAGANDDROP mClipboard.reset(new QWaylandClipboard(mDisplay.data())); mDrag.reset(new QWaylandDrag(mDisplay.data())); - +#endif QString icStr = QPlatformInputContextFactory::requested(); if (!icStr.isNull()) { mInputContext.reset(QPlatformInputContextFactory::create(icStr)); @@ -222,6 +223,7 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const return mFontDb.data(); } +#ifndef QT_NO_DRAGANDDROP QPlatformClipboard *QWaylandIntegration::clipboard() const { return mClipboard.data(); @@ -231,6 +233,7 @@ QPlatformDrag *QWaylandIntegration::drag() const { return mDrag.data(); } +#endif // QT_NO_DRAGANDDROP QPlatformInputContext *QWaylandIntegration::inputContext() const { |