diff options
author | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 15:10:43 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 16:10:23 +0100 |
commit | 1c70431808ca2d0797fda05bb9ee3640bff800bb (patch) | |
tree | 6bbf1333b7da5afea2e163263820d5c40dbc1ea3 /src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h | |
parent | 3e02c41cc43a20c8af41730934ae7bbac02ab861 (diff) | |
parent | c9734e76ce03ebba63e34b60b16a9cca3efa3569 (diff) |
Merge remote-tracking branch stable into dev
Conflicts:
.qmake.conf
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
src/plugins/platforms/qwayland-brcm-egl/main.cpp
src/plugins/platforms/qwayland-egl/main.cpp
src/plugins/platforms/qwayland-generic/main.cpp
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
Diffstat (limited to 'src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h')
-rw-r--r-- | src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h new file mode 100644 index 000000000..5f23f68de --- /dev/null +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QWAYLANDEGLPLATFORMINTEGRATION_H +#define QWAYLANDEGLPLATFORMINTEGRATION_H + +#include <QtWaylandClient/private/qwaylandintegration_p.h> + +#include "qwaylandeglclientbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class QWaylandEglPlatformIntegration : public QWaylandIntegration +{ +public: + QWaylandEglPlatformIntegration() + : QWaylandIntegration() + , m_client_buffer_integration(new QWaylandEglClientBufferIntegration()) + { + m_client_buffer_integration->initialize(display()); + } + + QWaylandEglClientBufferIntegration *clientBufferIntegration() const + { return m_client_buffer_integration; } + +private: + QWaylandEglClientBufferIntegration *m_client_buffer_integration; +}; + +QT_END_NAMESPACE + +#endif |