From e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 15 Mar 2012 10:39:47 +0100 Subject: Remove xlib plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's not much point having this with the xcb plugin being present, and xlib is pretty much unmaintained / broken anyway. Task-number: QTBUG-24913 Change-Id: I090a9a0e6d2f893c030574e23f1d59f610282bd3 Reviewed-by: Thorbjørn Lund Martsum Reviewed-by: Rick Stockton Reviewed-by: Samuel Rødal --- src/plugins/platforms/xlib/qglxintegration.h | 83 ---------------------------- 1 file changed, 83 deletions(-) delete mode 100644 src/plugins/platforms/xlib/qglxintegration.h (limited to 'src/plugins/platforms/xlib/qglxintegration.h') diff --git a/src/plugins/platforms/xlib/qglxintegration.h b/src/plugins/platforms/xlib/qglxintegration.h deleted file mode 100644 index 3aef49a52b..0000000000 --- a/src/plugins/platforms/xlib/qglxintegration.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef Q_GLX_CONTEXT_H -#define Q_GLX_CONTEXT_H - -#include "qxlibwindow.h" - -#include -#include - -#include - -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) -#include - -QT_BEGIN_NAMESPACE - -class QGLXContext : public QPlatformOpenGLContext -{ -public: - QGLXContext(QXlibScreen *xd, const QSurfaceFormat &format, QPlatformOpenGLContext *share); - ~QGLXContext(); - - QSurfaceFormat format() const; - void swapBuffers(QPlatformSurface *surface); - bool makeCurrent(QPlatformSurface *surface); - void doneCurrent(); - virtual void (*getProcAddress(const QByteArray& procName))(); - - GLXContext glxContext() const {return m_context;} - - QSurfaceFormat surfaceFormat() const; - -private: - QXlibScreen *m_screen; - GLXContext m_context; - QSurfaceFormat m_windowFormat; -}; - -QT_END_NAMESPACE - -#endif //!defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) - -#endif -- cgit v1.2.3