diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
commit | c76a1716a3e51a9fac78377890ea0161a9658344 (patch) | |
tree | 6d65c1f5c55f7b139aa2a3222847963edd379534 /src/client/qwaylandintegration.cpp | |
parent | acd10cd393abe04a8fd6fe3ab14055e09c85bc15 (diff) | |
parent | f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba (diff) |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I1efd16d6c5f939d61001376c3b010eae1927595b
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
-rw-r--r-- | src/client/qwaylandintegration.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index df88a4886..147e45b0c 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -132,9 +132,10 @@ QWaylandIntegration::QWaylandIntegration() { initializeInputDeviceIntegration(); mDisplay = new QWaylandDisplay(this); +#ifndef QT_NO_DRAGANDDROP mClipboard = new QWaylandClipboard(mDisplay); mDrag = new QWaylandDrag(mDisplay); - +#endif QString icStr = QPlatformInputContextFactory::requested(); if (!icStr.isNull()) { mInputContext.reset(QPlatformInputContextFactory::create(icStr)); @@ -153,8 +154,10 @@ QWaylandIntegration::QWaylandIntegration() QWaylandIntegration::~QWaylandIntegration() { +#ifndef QT_NO_DRAGANDDROP delete mDrag; delete mClipboard; +#endif #ifndef QT_NO_ACCESSIBILITY delete mAccessibility; #endif @@ -230,6 +233,7 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const return mFontDb; } +#ifndef QT_NO_DRAGANDDROP QPlatformClipboard *QWaylandIntegration::clipboard() const { return mClipboard; @@ -239,6 +243,7 @@ QPlatformDrag *QWaylandIntegration::drag() const { return mDrag; } +#endif // QT_NO_DRAGANDDROP QPlatformInputContext *QWaylandIntegration::inputContext() const { |