diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
| commit | 91bf24d44690a643d7cb74ab594da949b9e51e1b (patch) | |
| tree | 2cb20fdccd88afd647cfe9ecd8e97a98a14bb6e1 /src/plugins/platforms/wayland/qwaylandintegration.h | |
| parent | a363fad3f45335c6f03108a0ece5472901aa970f (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.zip Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.gz Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.h')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index 71f6d9c..fc748b0 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -65,6 +65,8 @@ public: QPlatformNativeInterface *nativeInterface() const; + QPlatformClipboard *clipboard() const; + private: bool hasOpenGL() const; @@ -72,6 +74,7 @@ private: QWaylandDisplay *mDisplay; bool mUseOpenGL; QPlatformNativeInterface *mNativeInterface; + mutable QPlatformClipboard *mClipboard; }; QT_END_NAMESPACE |