1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "egl: Reshuffle headers to help less fortunate systems with X11"

Browse Source 
This reverts commit ecf127505effbbf4dbfd1e7cb9561de5dae51bf2.

ecf12750 breaks the build of qtwayland.

Change-Id: If8bf04f035aa47e4e867d201ec7d95b0d3e18317
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Liang Qi 2016-05-04 10:44:53 +02:00
parent 60cd1c6775
commit 63ec10353d
18 changed files with 21 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platformsupport/eglconvenience/eglconvenience.pri
View File

@ -1,8 +1,7 @@
contains(QT_CONFIG,egl) {
HEADERS += \
$$PWD/qeglconvenience_p.h \
$$PWD/qeglstreamconvenience_p.h \
$$PWD/qt_egl_p.h
$$PWD/qeglstreamconvenience_p.h
SOURCES += \
$$PWD/qeglconvenience.cpp \

2
src/platformsupport/eglconvenience/qeglconvenience_p.h
View File

@ -48,7 +48,7 @@
#include <QtGui/QSurfaceFormat>
#include <QtCore/QVector>
#include <QtCore/QSizeF>
#include <QtPlatformSupport/private/qt_egl_p.h>
#include <EGL/egl.h>
QT_BEGIN_NAMESPACE

2
src/platformsupport/eglconvenience/qeglpbuffer_p.h
View File

@ -45,9 +45,9 @@
// We mean it.
//
#include <EGL/egl.h>
#include <qpa/qplatformoffscreensurface.h>
#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
#include <QtPlatformSupport/private/qt_egl_p.h>
QT_BEGIN_NAMESPACE

2
src/platformsupport/eglconvenience/qeglplatformcontext_p.h
View File

@ -49,7 +49,7 @@
#include <qpa/qplatformwindow.h>
#include <qpa/qplatformopenglcontext.h>
#include <QtCore/QVariant>
#include <QtPlatformSupport/private/qt_egl_p.h>
#include <EGL/egl.h>
QT_BEGIN_NAMESPACE

3
src/platformsupport/eglconvenience/qeglstreamconvenience_p.h
View File

@ -46,7 +46,8 @@
//
#include <qglobal.h>
#include <QtPlatformSupport/private/qt_egl_p.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
// This provides runtime EGLDevice/Output/Stream support even when eglext.h in
// the sysroot is not up-to-date.

67
src/platformsupport/eglconvenience/qt_egl_p.h
View File

@ -1,67 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** 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 The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QT_EGL_P_H
#define QT_EGL_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <EGL/egl.h>
#include <EGL/eglext.h>
#undef Status
#undef None
#undef Bool
#undef CursorShape
#undef KeyPress
#undef KeyRelease
#undef FocusIn
#undef FocusOut
#undef FontChange
#undef Expose
#undef Unsorted
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
#endif // QT_EGL_P_H

1
src/plugins/platforms/eglfs/qeglfscontext.cpp
View File

@ -31,7 +31,6 @@
**
****************************************************************************/
#include "qeglfsglobal.h"
#include <QtGui/QSurface>
#include <QtPlatformSupport/private/qeglconvenience_p.h>
#include <QtPlatformSupport/private/qeglpbuffer_p.h>

2
src/plugins/platforms/eglfs/qeglfscontext.h
View File

@ -34,9 +34,9 @@
#ifndef QEGLFSCONTEXT_H
#define QEGLFSCONTEXT_H
#include "qeglfsglobal.h"
#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
#include <QtCore/QVariant>
#include "qeglfsglobal.h"
QT_BEGIN_NAMESPACE

3
src/plugins/platforms/eglfs/qeglfsdeviceintegration.h
View File

@ -45,12 +45,13 @@
// We mean it.
//
#include "qeglfsglobal.h"
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformscreen.h>
#include <QtCore/QString>
#include <QtGui/QSurfaceFormat>
#include <QtGui/QImage>
#include <EGL/egl.h>
#include "qeglfsglobal.h"
QT_BEGIN_NAMESPACE

1
src/plugins/platforms/eglfs/qeglfsglobal.h
View File

@ -35,7 +35,6 @@
#define QEGLFSGLOBAL_H
#include <qglobal.h>
#include <QtPlatformSupport/private/qt_egl_p.h>
#ifdef QT_BUILD_EGL_DEVICE_LIB
#define Q_EGLFS_EXPORT Q_DECL_EXPORT

2
src/plugins/platforms/eglfs/qeglfshooks.h
View File

@ -34,8 +34,8 @@
#ifndef QEGLFSHOOKS_H
#define QEGLFSHOOKS_H
#include "qeglfsglobal.h"
#include "qeglfsdeviceintegration.h"
#include "qeglfsglobal.h"
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/eglfs/qeglfsintegration.cpp
View File

@ -79,6 +79,8 @@
#include <QtPlatformHeaders/qeglfsfunctions.h>
#include <EGL/egl.h>
static void initResources()
{
#ifndef QT_NO_CURSOR

3
src/plugins/platforms/eglfs/qeglfsintegration.h
View File

@ -34,11 +34,12 @@
#ifndef QEGLFSINTEGRATION_H
#define QEGLFSINTEGRATION_H
#include "qeglfsglobal.h"
#include <QtCore/QVariant>
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformscreen.h>
#include <EGL/egl.h>
#include "qeglfsglobal.h"
QT_BEGIN_NAMESPACE

3
src/plugins/platforms/eglfs/qeglfsoffscreenwindow.h
View File

@ -34,8 +34,9 @@
#ifndef QEGLFSOFFSCREENWINDOW_H
#define QEGLFSOFFSCREENWINDOW_H
#include "qeglfsglobal.h"
#include <EGL/egl.h>
#include <qpa/qplatformoffscreensurface.h>
#include "qeglfsglobal.h"
QT_BEGIN_NAMESPACE

1
src/plugins/platforms/eglfs/qeglfsscreen.h
View File

@ -36,6 +36,7 @@
#include "qeglfsglobal.h"
#include <QtCore/QPointer>
#include <EGL/egl.h>
QT_BEGIN_NAMESPACE

3
src/plugins/platforms/eglfs/qeglfswindow.h
View File

@ -34,12 +34,13 @@
#ifndef QEGLFSWINDOW_H
#define QEGLFSWINDOW_H
#include "qeglfsglobal.h"
#include "qeglfsintegration.h"
#include "qeglfsscreen.h"
#include "qeglfsglobal.h"
#include <qpa/qplatformwindow.h>
#include <QtPlatformSupport/private/qopenglcompositor_p.h>
#include <EGL/egl.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h
View File

@ -40,7 +40,7 @@
#include <QtGui/private/qcssparser_p.h>
#include <QtGui/private/qtextengine_p.h>
#include <QtPlatformSupport/private/qt_egl_p.h>
#include <EGL/egl.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -59,7 +59,7 @@
#include <QtGui/private/qguiapplication_p.h>
#ifdef XCB_USE_EGL
#include <QtPlatformSupport/private/qt_egl_p.h>
#include <EGL/egl.h>
#endif
#ifdef XCB_USE_XLIB