diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-21 13:43:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 15:32:43 +0100 |
| commit | ab30cabb6383413ee3b2913615d75082c0c55686 (patch) | |
| tree | 34ec3571f79dcb4e25f01467abe6c7516e9a10d2 /src/client/qwaylanddisplay.cpp | |
| parent | 543e34f643efd7fdd3126244a8a6b2596fb21da4 (diff) | |
| download | qtwayland-ab30cabb6383413ee3b2913615d75082c0c55686.tar.gz qtwayland-ab30cabb6383413ee3b2913615d75082c0c55686.tar.bz2 qtwayland-ab30cabb6383413ee3b2913615d75082c0c55686.zip | |
Rename QWaylandGLIntegration to QWaylandClientBufferIntegration
also add a factory to load QWaylandClientBufferIntegrationPlugins
Change-Id: Ia6a03627659b0452439ae664fceef21eaf0f6de0
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 4bcf2f68..880c76df 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -50,7 +50,7 @@ #include "qwaylandclipboard.h" #include "qwaylanddatadevicemanager.h" -#include "qwaylandglintegration.h" +#include "qwaylandclientbufferintegration.h" #include "qwaylandwindowmanagerintegration.h" @@ -78,9 +78,9 @@ struct wl_surface *QWaylandDisplay::createSurface(void *handle) return surface; } -QWaylandGLIntegration * QWaylandDisplay::glIntegration() const +QWaylandClientBufferIntegration * QWaylandDisplay::clientBufferIntegration() const { - return mWaylandIntegration->glIntegration(); + return mWaylandIntegration->clientBufferIntegration(); } QWaylandWindowManagerIntegration *QWaylandDisplay::windowManagerIntegration() const |