diff options
Diffstat (limited to 'examples/wayland/server-buffer')
10 files changed, 52 insertions, 49 deletions
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp index 54c586ce6..3f7a94d03 100644 --- a/examples/wayland/server-buffer/client/main.cpp +++ b/examples/wayland/server-buffer/client/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** @@ -83,7 +83,7 @@ public: return; } - QWaylandIntegration *wayland_integration = static_cast<QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration()); + QtWaylandClient::QWaylandIntegration *wayland_integration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration()); m_server_buffer_integration = wayland_integration->serverBufferIntegration(); if (!m_server_buffer_integration) { @@ -93,7 +93,7 @@ public: } - QWaylandDisplay *wayland_display = wayland_integration->display(); + QtWaylandClient::QWaylandDisplay *wayland_display = wayland_integration->display(); struct ::wl_registry *registry = wl_display_get_registry(wayland_display->wl_display()); wl_proxy_set_queue(reinterpret_cast<struct wl_proxy *>(registry), wayland_display->wl_event_queue()); QtWayland::wl_registry::init(registry); @@ -155,7 +155,7 @@ protected: void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) Q_DECL_OVERRIDE { - QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer); + QtWaylandClient::QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer); if (m_server_buffer_list.isEmpty()) { setWidth(serverBuffer->size().width()); setHeight(serverBuffer->size().height()); @@ -168,8 +168,8 @@ protected: } private: - QWaylandServerBufferIntegration *m_server_buffer_integration; - QList<QWaylandServerBuffer *>m_server_buffer_list; + QtWaylandClient::QWaylandServerBufferIntegration *m_server_buffer_integration; + QList<QtWaylandClient::QWaylandServerBuffer *>m_server_buffer_list; GLuint m_server_buffer_texture; QOpenGLContext *m_context; QOpenGLVertexArrayObject *m_vao; diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp index 2f0d204d3..5c393e91c 100644 --- a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp +++ b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** @@ -74,7 +74,7 @@ static const char fragment_shader[] = " gl_FragColor = texture2D(textureSampler, uv);" "}"; -ServerBufferRenderer::ServerBufferRenderer(QWaylandServerBuffer *serverBuffer) +ServerBufferRenderer::ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer) : QOpenGLFunctions(QOpenGLContext::currentContext()) , m_server_buffer(serverBuffer) , m_texture(0) diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.h b/examples/wayland/server-buffer/client/serverbufferrenderer.h index 7e8999b1c..146d3a99a 100644 --- a/examples/wayland/server-buffer/client/serverbufferrenderer.h +++ b/examples/wayland/server-buffer/client/serverbufferrenderer.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** @@ -52,11 +52,11 @@ class QOpenGLShaderProgram; class ServerBufferRenderer : public QOpenGLFunctions { public: - ServerBufferRenderer(QWaylandServerBuffer *serverBuffer); + ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer); void render(const QMatrix4x4 &transform); private: - QWaylandServerBuffer *m_server_buffer; + QtWaylandClient::QWaylandServerBuffer *m_server_buffer; GLuint m_texture; QOpenGLVertexArrayObject *m_vao; diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 6d408b1b7..312cff2c5 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -1,7 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +18,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** @@ -54,6 +55,7 @@ #include <QQuickView> #include "qwayland-server-share-buffer.h" +#include <QtCompositor/qwaylandoutput.h> #include <QtCompositor/private/qwlcompositor_p.h> #include <QtCompositor/private/qwlserverbufferintegration_p.h> @@ -70,7 +72,7 @@ class QmlCompositor public: QmlCompositor() - : QWaylandQuickCompositor(this, 0, DefaultExtensions | SubSurfaceExtension) + : QWaylandQuickCompositor(0, DefaultExtensions | SubSurfaceExtension) , QtWaylandServer::qt_share_buffer(QWaylandCompositor::handle()->wl_display(), 1) , m_server_buffer_32_bit(0) , m_server_buffer_item_32_bit(0) @@ -82,6 +84,7 @@ public: setColor(Qt::black); create(); grabWindow(); + createOutput(this, "", ""); addDefaultShell(); connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks())); diff --git a/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml b/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml index 7c7306e36..e8ce19694 100644 --- a/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml +++ b/examples/wayland/server-buffer/compositor/qml/ServerBufferContainer.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml index c9d62be55..536065a6a 100644 --- a/examples/wayland/server-buffer/compositor/qml/main.qml +++ b/examples/wayland/server-buffer/compositor/qml/main.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** diff --git a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp index 4a47c279d..96ceed0a1 100644 --- a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp +++ b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Compositor. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** diff --git a/examples/wayland/server-buffer/compositor/serverbufferitem.h b/examples/wayland/server-buffer/compositor/serverbufferitem.h index 31fad4e86..3add52c49 100644 --- a/examples/wayland/server-buffer/compositor/serverbufferitem.h +++ b/examples/wayland/server-buffer/compositor/serverbufferitem.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Compositor. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** diff --git a/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h b/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h index 76ff5a4ac..c94a34e2e 100644 --- a/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h +++ b/examples/wayland/server-buffer/compositor/serverbuffertextureprovider.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Compositor. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** diff --git a/examples/wayland/server-buffer/share-buffer.xml b/examples/wayland/server-buffer/share-buffer.xml index 57a1fd2c5..ceb6b11fd 100644 --- a/examples/wayland/server-buffer/share-buffer.xml +++ b/examples/wayland/server-buffer/share-buffer.xml @@ -1,8 +1,8 @@ <protocol name="share_buffer"> <copyright> - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ This file is part of the plugins of the Qt Toolkit. @@ -18,8 +18,8 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - of its contributors may be used to endorse or promote products derived + * Neither the name of The Qt Company Ltd nor the names of its + contributors may be used to endorse or promote products derived from this software without specific prior written permission. |