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

Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGL

Browse Source 
Also moves the openglwindow test to the opengl folder, as it makes use of these
classes.

Task-number: QTBUG-74409
Change-Id: Id9f0013cedcc8bd1e87122c005641d7298525045
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-12-11 14:50:40 +01:00
parent 06bb315beb
commit f3ecda32e0
43 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gui/gui.pro
View File

@ -6,5 +6,3 @@ CONFIG += no_docs_target
SUBDIRS += analogclock
SUBDIRS += rasterwindow
qtHaveModule(gui):qtConfig(opengl): \
SUBDIRS += openglwindow

1
examples/opengl/opengl.pro
View File

@ -2,6 +2,7 @@ TEMPLATE = subdirs
SUBDIRS = hellowindow \
paintedwindow \
openglwindow \
qopenglwindow
qtHaveModule(widgets) {

0
examples/gui/openglwindow/main.cpp → examples/opengl/openglwindow/main.cpp
View File

0
examples/gui/openglwindow/openglwindow.cpp → examples/opengl/openglwindow/openglwindow.cpp
View File

0
examples/gui/openglwindow/openglwindow.h → examples/opengl/openglwindow/openglwindow.h
View File

1
examples/gui/openglwindow/openglwindow.pri → examples/opengl/openglwindow/openglwindow.pri
View File

@ -1,3 +1,4 @@
QT += opengl
INCLUDEPATH += $$PWD
SOURCES += $$PWD/openglwindow.cpp
HEADERS += $$PWD/openglwindow.h

2
examples/gui/openglwindow/openglwindow.pro → examples/opengl/openglwindow/openglwindow.pro
View File

@ -3,5 +3,5 @@ include(openglwindow.pri)
SOURCES += \
main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/openglwindow
INSTALLS += target

2
examples/opengl/paintedwindow/paintedwindow.pro
View File

@ -1,3 +1,5 @@
QT += opengl
HEADERS += paintedwindow.h
SOURCES += paintedwindow.cpp main.cpp

2
examples/widgets/painting/shared/arthurwidgets.cpp
View File

@ -62,8 +62,8 @@
#include <QRegularExpression>
#include <QOffscreenSurface>
#include <QOpenGLContext>
#include <QOpenGLPaintDevice>
#if QT_CONFIG(opengl)
#include <QtOpenGL/QOpenGLPaintDevice>
#include <QtOpenGL/QOpenGLWindow>
#endif

2
examples/widgets/windowcontainer/windowcontainer.cpp
View File

@ -60,7 +60,7 @@
#include <QWidget>
// Making use of the class from the opengl example in gui.
// Making use of the class from the openglwindow example
class Window : public OpenGLWindow
{
Q_OBJECT

2
examples/widgets/windowcontainer/windowcontainer.pro
View File

@ -6,4 +6,4 @@ QT += widgets
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/windowcontainer
INSTALLS += target
include(../../gui/openglwindow/openglwindow.pri)
include(../../opengl/openglwindow/openglwindow.pri)

21
src/gui/opengl/opengl.pri
View File

@ -10,20 +10,9 @@ qtConfig(opengl) {
opengl/qopenglfunctions.h \
opengl/qopenglframebufferobject.h \
opengl/qopenglframebufferobject_p.h \
opengl/qopenglpaintdevice.h \
opengl/qopenglpaintdevice_p.h \
opengl/qopenglbuffer.h \
opengl/qopenglshaderprogram.h \
opengl/qopenglextensions_p.h \
opengl/qopenglgradientcache_p.h \
opengl/qopengltexturecache_p.h \
opengl/qopenglengineshadermanager_p.h \
opengl/qopengl2pexvertexarray_p.h \
opengl/qopenglpaintengine_p.h \
opengl/qopenglengineshadersource_p.h \
opengl/qopenglcustomshaderstage_p.h \
opengl/qopengltextureglyphcache_p.h \
opengl/qopenglshadercache_p.h \
opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \
opengl/qopenglvertexarrayobject.h \
@ -31,7 +20,6 @@ qtConfig(opengl) {
opengl/qopengltexture.h \
opengl/qopengltexture_p.h \
opengl/qopengltexturehelper_p.h \
opengl/qopengltextureuploader_p.h \
opengl/qopenglpixeltransferoptions.h \
opengl/qopenglextrafunctions.h \
opengl/qopenglprogrambinarycache_p.h
@ -39,23 +27,14 @@ qtConfig(opengl) {
SOURCES += opengl/qopengl.cpp \
opengl/qopenglfunctions.cpp \
opengl/qopenglframebufferobject.cpp \
opengl/qopenglpaintdevice.cpp \
opengl/qopenglbuffer.cpp \
opengl/qopenglshaderprogram.cpp \
opengl/qopenglgradientcache.cpp \
opengl/qopengltexturecache.cpp \
opengl/qopenglengineshadermanager.cpp \
opengl/qopengl2pexvertexarray.cpp \
opengl/qopenglpaintengine.cpp \
opengl/qopenglcustomshaderstage.cpp \
opengl/qopengltextureglyphcache.cpp \
opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp \
opengl/qopengltextureblitter.cpp \
opengl/qopengltexture.cpp \
opengl/qopengltexturehelper.cpp \
opengl/qopengltextureuploader.cpp \
opengl/qopenglpixeltransferoptions.cpp \
opengl/qopenglprogrambinarycache.cpp

21
src/opengl/opengl.pro
View File

@ -10,11 +10,32 @@ qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2
HEADERS += \
qopengl2pexvertexarray_p.h \
qopenglcustomshaderstage_p.h \
qopengldebug.h \
qopenglengineshadermanager_p.h \
qopenglengineshadersource_p.h \
qopenglgradientcache_p.h \
qopenglpaintdevice.h \
qopenglpaintdevice_p.h \
qopenglpaintengine_p.h \
qopenglshadercache_p.h \
qopengltexturecache_p.h \
qopengltextureglyphcache_p.h \
qopengltextureuploader_p.h \
qopenglwindow.h \
qtopenglglobal.h
SOURCES += \
qopengl2pexvertexarray.cpp \
qopenglcustomshaderstage.cpp \
qopenglengineshadermanager.cpp \
qopenglgradientcache.cpp \
qopenglpaintdevice.cpp \
qopenglpaintengine.cpp \
qopengltexturecache.cpp \
qopengltextureglyphcache.cpp \
qopengltextureuploader.cpp \
qopenglwindow.cpp \
qopengldebug.cpp

2
src/gui/opengl/qopengl2pexvertexarray.cpp → src/opengl/qopengl2pexvertexarray.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage

3
src/gui/opengl/qopengl2pexvertexarray_p.h → src/opengl/qopengl2pexvertexarray_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,6 @@
#ifndef QOPENGL2PEXVERTEXARRAY_P_H
#define QOPENGL2PEXVERTEXARRAY_P_H
#include <QtGui/private/qtguiglobal_p.h>
#include <QRectF>
#include <private/qdatabuffer_p.h>

2
src/gui/opengl/qopenglcustomshaderstage.cpp → src/opengl/qopenglcustomshaderstage.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage

6
src/gui/opengl/qopenglcustomshaderstage_p.h → src/opengl/qopenglcustomshaderstage_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,7 @@
// We mean it.
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QtOpenGL/qtopenglglobal.h>
#include <QOpenGLShaderProgram>
QT_BEGIN_NAMESPACE
@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
class QPainter;
class QOpenGLCustomShaderStagePrivate;
class Q_GUI_EXPORT QOpenGLCustomShaderStage
class Q_OPENGL_EXPORT QOpenGLCustomShaderStage
{
Q_DECLARE_PRIVATE(QOpenGLCustomShaderStage)
public:

4
src/gui/opengl/qopenglengineshadermanager.cpp → src/opengl/qopenglengineshadermanager.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -40,7 +40,7 @@
#include "qopenglengineshadermanager_p.h"
#include "qopenglengineshadersource_p.h"
#include "qopenglpaintengine_p.h"
#include "qopenglshadercache_p.h"
#include <private/qopenglshadercache_p.h>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtCore/qthreadstorage.h>

7
src/gui/opengl/qopenglengineshadermanager_p.h → src/opengl/qopenglengineshadermanager_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -220,7 +220,6 @@
#ifndef QOPENGLENGINE_SHADER_MANAGER_H
#define QOPENGLENGINE_SHADER_MANAGER_H
#include <QtGui/private/qtguiglobal_p.h>
#include <QOpenGLShader>
#include <QOpenGLShaderProgram>
#include <QPainter>
@ -255,7 +254,7 @@ static const GLuint QT_PMV_MATRIX_3_ATTR = 5;
class QOpenGLEngineShaderProg;
class Q_GUI_EXPORT QOpenGLEngineSharedShaders
class Q_OPENGL_EXPORT QOpenGLEngineSharedShaders
{
Q_GADGET
public:
@ -406,7 +405,7 @@ public:
}
};
class Q_GUI_EXPORT QOpenGLEngineShaderManager : public QObject
class Q_OPENGL_EXPORT QOpenGLEngineShaderManager : public QObject
{
Q_OBJECT
public:

3
src/gui/opengl/qopenglengineshadersource_p.h → src/opengl/qopenglengineshadersource_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -52,7 +52,6 @@
#ifndef QOPENGL_ENGINE_SHADER_SOURCE_H
#define QOPENGL_ENGINE_SHADER_SOURCE_H
#include <QtGui/private/qtguiglobal_p.h>
#include "qopenglengineshadermanager_p.h"
QT_BEGIN_NAMESPACE

4
src/gui/opengl/qopenglgradientcache.cpp → src/opengl/qopenglgradientcache.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -44,7 +44,7 @@
#include <QtCore/qmutex.h>
#include <QtCore/qrandom.h>
#include "qopenglfunctions.h"
#include "qopenglextensions_p.h"
#include <private/qopenglextensions_p.h>
#ifndef GL_RGBA16
#define GL_RGBA16 0x805B

3
src/gui/opengl/qopenglgradientcache_p.h → src/opengl/qopenglgradientcache_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,6 @@
// We mean it.
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QMultiHash>
#include <QObject>
#include <private/qopenglcontext_p.h>

4
src/gui/opengl/qopenglpaintdevice.cpp → src/opengl/qopenglpaintdevice.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\class QOpenGLPaintDevice
\brief The QOpenGLPaintDevice class enables painting to an OpenGL context using QPainter.
\since 5.0
\inmodule QtGui
\inmodule QtOpenGL
\ingroup painting-3D

6
src/gui/opengl/qopenglpaintdevice.h → src/opengl/qopenglpaintdevice.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -40,7 +40,7 @@
#ifndef QOPENGLPAINTDEVICE_H
#define QOPENGLPAINTDEVICE_H
#include <QtGui/qtguiglobal.h>
#include <QtOpenGL/qtopenglglobal.h>
#ifndef QT_NO_OPENGL
@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLPaintDevicePrivate;
class Q_GUI_EXPORT QOpenGLPaintDevice : public QPaintDevice
class Q_OPENGL_EXPORT QOpenGLPaintDevice : public QPaintDevice
{
Q_DECLARE_PRIVATE(QOpenGLPaintDevice)
public:

5
src/gui/opengl/qopenglpaintdevice_p.h → src/opengl/qopenglpaintdevice_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,6 @@
// We mean it.
//
#include <QtGui/private/qtguiglobal_p.h>
#include <qopenglpaintdevice.h>
QT_BEGIN_NAMESPACE
@ -59,7 +58,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLContext;
class QPaintEngine;
class Q_GUI_EXPORT QOpenGLPaintDevicePrivate
class Q_OPENGL_EXPORT QOpenGLPaintDevicePrivate
{
public:
QOpenGLPaintDevicePrivate(const QSize &size);

16
src/gui/opengl/qopenglpaintengine.cpp → src/opengl/qopenglpaintengine.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -62,8 +62,8 @@
// #define QT_OPENGL_CACHE_AS_VBOS
#include "qopenglgradientcache_p.h"
#include "qopengltexturecache_p.h"
#include <private/qopenglgradientcache_p.h>
#include <private/qopengltexturecache_p.h>
#include "qopenglpaintengine_p.h"
#include "qopenglpaintdevice_p.h"
@ -81,9 +81,9 @@
#include <private/qstatictext_p.h>
#include <private/qtriangulator_p.h>
#include "qopenglengineshadermanager_p.h"
#include "qopengl2pexvertexarray_p.h"
#include "qopengltextureglyphcache_p.h"
#include <private/qopenglengineshadermanager_p.h>
#include <private/qopengl2pexvertexarray_p.h>
#include <private/qopengltextureglyphcache_p.h>
#include <QDebug>
@ -110,7 +110,7 @@
QT_BEGIN_NAMESPACE
Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
Q_OPENGL_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
////////////////////////////////// Private Methods //////////////////////////////////////////
@ -1348,7 +1348,7 @@ void QOpenGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush)
d->fill(path);
}
Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
void QOpenGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)

5
src/gui/opengl/qopenglpaintengine_p.h → src/opengl/qopenglpaintengine_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,6 @@
// We mean it.
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QDebug>
#include <qopenglpaintdevice.h>
@ -109,7 +108,7 @@ public:
QRect rectangleClip;
};
class Q_GUI_EXPORT QOpenGL2PaintEngineEx : public QPaintEngineEx
class Q_OPENGL_EXPORT QOpenGL2PaintEngineEx : public QPaintEngineEx
{
Q_DECLARE_PRIVATE(QOpenGL2PaintEngineEx)
public:

4
src/gui/opengl/qopenglshadercache_p.h → src/opengl/qopenglshadercache_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,7 @@
#ifndef QOPENGLSHADERCACHE_P_H
#define QOPENGLSHADERCACHE_P_H
#include <QtGui/private/qtguiglobal_p.h>
#include <QtOpenGL/qtopenglglobal.h>
QT_BEGIN_NAMESPACE

4
src/gui/opengl/qopengltexturecache.cpp → src/opengl/qopengltexturecache.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -38,7 +38,7 @@
****************************************************************************/
#include "qopengltexturecache_p.h"
#include "qopengltextureuploader_p.h"
#include <private/qopengltextureuploader_p.h>
#include <qmath.h>
#include <qopenglfunctions.h>
#include <private/qimagepixmapcleanuphooks_p.h>

6
src/gui/opengl/qopengltexturecache_p.h → src/opengl/qopengltexturecache_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,7 @@
#ifndef QOPENGLTEXTURECACHE_P_H
#define QOPENGLTEXTURECACHE_P_H
#include <QtGui/private/qtguiglobal_p.h>
#include <QtOpenGL/qtopenglglobal.h>
#include <QHash>
#include <QObject>
#include <QCache>
@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLCachedTexture;
class Q_GUI_EXPORT QOpenGLTextureCache : public QOpenGLSharedResource
class Q_OPENGL_EXPORT QOpenGLTextureCache : public QOpenGLSharedResource
{
public:
static QOpenGLTextureCache *cacheForContext(QOpenGLContext *context);

6
src/gui/opengl/qopengltextureglyphcache.cpp → src/opengl/qopengltextureglyphcache.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -38,9 +38,9 @@
****************************************************************************/
#include "qopengltextureglyphcache_p.h"
#include "qopenglpaintengine_p.h"
#include <private/qopenglpaintengine_p.h>
#include "private/qopenglengineshadersource_p.h"
#include "qopenglextensions_p.h"
#include <private/qopenglextensions_p.h>
#include <qrgb.h>
#include <private/qdrawhelper_p.h>

6
src/gui/opengl/qopengltextureglyphcache_p.h → src/opengl/qopengltextureglyphcache_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -51,7 +51,7 @@
// We mean it.
//
#include <QtGui/private/qtguiglobal_p.h>
#include <QtOpenGL/qtopenglglobal.h>
#include <private/qtextureglyphcache_p.h>
#include <private/qopenglcontext_p.h>
#include <qopenglshaderprogram.h>
@ -107,7 +107,7 @@ public:
int m_height;
};
class Q_GUI_EXPORT QOpenGLTextureGlyphCache : public QImageTextureGlyphCache
class Q_OPENGL_EXPORT QOpenGLTextureGlyphCache : public QImageTextureGlyphCache
{
public:
QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix, const QColor &color = QColor());

2
src/gui/opengl/qopengltextureuploader.cpp → src/opengl/qopengltextureuploader.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage

6
src/gui/opengl/qopengltextureuploader_p.h → src/opengl/qopengltextureuploader_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -52,14 +52,14 @@
#define QOPENGLTEXTUREUPLOADER_P_H
#include <QtCore/qsize.h>
#include <QtGui/private/qtguiglobal_p.h>
#include <QtOpenGL/qtopenglglobal.h>
#include <QtGui/private/qopenglcontext_p.h>
QT_BEGIN_NAMESPACE
class QImage;
class Q_GUI_EXPORT QOpenGLTextureUploader
class Q_OPENGL_EXPORT QOpenGLTextureUploader
{
public:
enum BindOption {

6
src/opengl/qopenglwidget.cpp
View File

@ -45,14 +45,16 @@
#include <QtGui/QWindow>
#include <QtGui/QGuiApplication>
#include <QtGui/QScreen>
#include <QtGui/QOpenGLPaintDevice>
#include <QtGui/qpa/qplatformwindow.h>
#include <QtGui/qpa/qplatformintegration.h>
#include <QtOpenGL/QOpenGLPaintDevice>
#include <QtGui/private/qguiapplication_p.h>
#include <QtGui/private/qopenglextensions_p.h>
#include <QtGui/private/qfont_p.h>
#include <QtGui/private/qopenglpaintdevice_p.h>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtOpenGL/private/qopenglpaintdevice_p.h>
#include <QtWidgets/private/qwidget_p.h>
QT_BEGIN_NAMESPACE

2
src/opengl/qopenglwindow.cpp
View File

@ -39,7 +39,6 @@
#include "qopenglwindow.h"
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLPaintDevice>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLTextureBlitter>
#include <QtGui/private/qpaintdevicewindow_p.h>
@ -47,6 +46,7 @@
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QMatrix4x4>
#include <QtGui/QOffscreenSurface>
#include <QtOpenGL/QOpenGLPaintDevice>
QT_BEGIN_NAMESPACE

1
src/plugins/platforms/minimalegl/minimalegl.pro
View File

@ -21,6 +21,7 @@ HEADERS = qminimaleglintegration.h \
qminimaleglscreen.h
qtConfig(opengl) {
QT += opengl
SOURCES += qminimaleglbackingstore.cpp
HEADERS += qminimaleglbackingstore.h
}

2
src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp
View File

@ -40,7 +40,7 @@
#include "qminimaleglbackingstore.h"
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLPaintDevice>
#include <QtOpenGL/QOpenGLPaintDevice>
QT_BEGIN_NAMESPACE

2
tests/auto/gui/qopengl/qopengl.pro
View File

@ -4,7 +4,7 @@
CONFIG += testcase
TARGET = tst_qopengl
QT += gui-private core-private testlib
QT += opengl gui-private core-private testlib
SOURCES += tst_qopengl.cpp

3
tests/auto/gui/qopengl/tst_qopengl.cpp
View File

@ -26,14 +26,13 @@
**
****************************************************************************/
#include <QtOpenGL/QOpenGLPaintDevice>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLFunctions_4_2_Core>
#include <QtGui/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLBuffer>
#include <QtGui/QOpenGLPaintDevice>
#include <QtGui/QOpenGLTexture>
#include <QtGui/QPainter>
#include <QtGui/QScreen>

1
tests/auto/other/lancelot/lancelot.pro
View File

@ -1,6 +1,7 @@
CONFIG += testcase
TARGET = tst_lancelot
QT += testlib gui-private
qtConfig(opengl): QT += opengl
SOURCES += tst_lancelot.cpp \
paintcommands.cpp

2
tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
TARGET = tst_qopenglwidget
QT += opengl gui-private core-private testlib widgets
QT += opengl opengl-private gui-private core-private testlib widgets
SOURCES += tst_qopenglwidget.cpp

2
tests/benchmarks/gui/painting/lancebench/lancebench.pro
View File

@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_bench_lancebench
QT += testlib gui-private
qtConfig(opengl): QT += opengl
SOURCES += tst_lancebench.cpp