1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build without feature.clipboard

Browse Source 
Change-Id: I195efecca9350cb519865f251cdee9c6e23d3592
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Tasuku Suzuki 2017-01-13 16:58:31 +09:00
parent a37ac71c33
commit 12cc564878
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wayland/client.pro
View File

@ -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)

6
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -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()

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -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"

10
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -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();

8
src/plugins/platforms/wayland/qwaylandintegration_p.h
View File

@ -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;