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 | |
parent | fd310aac0486ac26076e0aea87f6f8e0ed9aa542 (diff) | |
download | qtwayland-78215d02a052ffc58cca109ef91fd531594375e9.tar.gz |
Fix build without feature.clipboard
Change-Id: I195efecca9350cb519865f251cdee9c6e23d3592
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/client/client.pro | 7 | ||||
-rw-r--r-- | src/client/qwaylanddatadevice.cpp | 6 | ||||
-rw-r--r-- | src/client/qwaylanddisplay.cpp | 2 | ||||
-rw-r--r-- | src/client/qwaylandintegration.cpp | 10 | ||||
-rw-r--r-- | src/client/qwaylandintegration_p.h | 8 |
5 files changed, 27 insertions, 6 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 7482cfd6..f1338cc9 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -40,7 +40,6 @@ SOURCES += qwaylandintegration.cpp \ qwaylandwindow.cpp \ qwaylandscreen.cpp \ qwaylandshmwindow.cpp \ - qwaylandclipboard.cpp \ qwaylanddnd.cpp \ qwaylanddataoffer.cpp \ qwaylanddatadevicemanager.cpp \ @@ -78,7 +77,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputdevice_p.h \ qwaylandbuffer_p.h \ qwaylandshmwindow_p.h \ - qwaylandclipboard_p.h \ qwaylanddnd_p.h \ qwaylanddataoffer_p.h \ qwaylanddatadevicemanager_p.h \ @@ -108,6 +106,11 @@ HEADERS += qwaylandintegration_p.h \ ../shared/qwaylandxkb_p.h \ ../shared/qwaylandsharedmemoryformathelper_p.h +qtConfig(clipboard) { + HEADERS += qwaylandclipboard_p.h + SOURCES += qwaylandclipboard.cpp +} + include(hardwareintegration/hardwareintegration.pri) include(shellintegration/shellintegration.pri) include(inputdeviceintegration/inputdeviceintegration.pri) diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index b76647ea..ebd3ce1b 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -52,7 +52,9 @@ #include <QtGui/QGuiApplication> #include <QtGui/private/qguiapplication_p.h> +#if QT_CONFIG(clipboard) #include <qpa/qplatformclipboard.h> +#endif #include <qpa/qplatformdrag.h> #include <qpa/qwindowsysteminterface.h> @@ -235,13 +237,17 @@ void QWaylandDataDevice::data_device_selection(wl_data_offer *id) else m_selectionOffer.reset(); +#if QT_CONFIG(clipboard) QGuiApplicationPrivate::platformIntegration()->clipboard()->emitChanged(QClipboard::Clipboard); +#endif } void QWaylandDataDevice::selectionSourceCancelled() { m_selectionSource.reset(); +#if QT_CONFIG(clipboard) QGuiApplicationPrivate::platformIntegration()->clipboard()->emitChanged(QClipboard::Clipboard); +#endif } void QWaylandDataDevice::dragSourceCancelled() diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 534373b1..851d715b 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -44,7 +44,9 @@ #include "qwaylandscreen_p.h" #include "qwaylandcursor_p.h" #include "qwaylandinputdevice_p.h" +#if QT_CONFIG(clipboard) #include "qwaylandclipboard_p.h" +#endif #include "qwaylanddatadevicemanager_p.h" #include "qwaylandhardwareintegration_p.h" #include "qwaylandxdgshell_p.h" diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 78d4284b..78a1182c 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(); diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 1689581a..90fce4fc 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -86,8 +86,10 @@ public: QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(clipboard) QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; +#endif +#if QT_CONFIG(draganddrop) QPlatformDrag *drag() const Q_DECL_OVERRIDE; #endif QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; @@ -131,8 +133,10 @@ private: QWaylandShellIntegration *createShellIntegration(const QString& interfaceName); QScopedPointer<QPlatformFontDatabase> mFontDb; -#if QT_CONFIG(draganddrop) +#if QT_CONFIG(clipboard) QScopedPointer<QPlatformClipboard> mClipboard; +#endif +#if QT_CONFIG(draganddrop) QScopedPointer<QPlatformDrag> mDrag; #endif QScopedPointer<QPlatformNativeInterface> mNativeInterface; |