summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/.prev_CMakeLists.txt1
-rw-r--r--src/gui/CMakeLists.txt1
-rw-r--r--src/gui/opengl/opengl.pri2
-rw-r--r--src/opengl/CMakeLists.txt1
-rw-r--r--src/opengl/opengl.pro2
-rw-r--r--src/opengl/qopengltextureblitter.cpp2
-rw-r--r--src/opengl/qopenglvertexarrayobject.cpp (renamed from src/gui/opengl/qopenglvertexarrayobject.cpp)6
-rw-r--r--src/opengl/qopenglvertexarrayobject.h (renamed from src/gui/opengl/qopenglvertexarrayobject.h)8
-rw-r--r--src/opengl/qopenglvertexarrayobject_p.h (renamed from src/gui/opengl/qopenglvertexarrayobject_p.h)12
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/api/api.pri1
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfscursor.cpp2
-rw-r--r--tests/auto/gui/qopengl/tst_qopengl.cpp2
14 files changed, 22 insertions, 22 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 84c3749947..1fea63419b 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -262,7 +262,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
- opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
rhi/qrhigles2.cpp rhi/qrhigles2_p.h
rhi/qrhigles2_p_p.h
)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index bd8c59e198..6a9951412c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -344,7 +344,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
- opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
rhi/qrhigles2.cpp rhi/qrhigles2_p.h
rhi/qrhigles2_p_p.h
)
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index c606e9ec02..4962e57a62 100644
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@@ -12,7 +12,6 @@ qtConfig(opengl) {
opengl/qopenglextensions_p.h \
opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \
- opengl/qopenglvertexarrayobject.h \
opengl/qopenglextrafunctions.h \
opengl/qopenglprogrambinarycache_p.h
@@ -21,7 +20,6 @@ qtConfig(opengl) {
opengl/qopenglbuffer.cpp \
opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \
- opengl/qopenglvertexarrayobject.cpp \
opengl/qopenglprogrambinarycache.cpp
!qtConfig(opengles2) {
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 17366f7cf0..6063ca58be 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_module(OpenGL
qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
qopengltexturehelper.cpp qopengltexturehelper_p.h
qopengltextureuploader.cpp qopengltextureuploader_p.h
+ qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
qopenglwindow.cpp qopenglwindow.h
qtopenglglobal.h
DEFINES
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 950a72cc03..e2b27984c7 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -30,6 +30,7 @@ HEADERS += \
qopengltexturecache_p.h \
qopengltextureglyphcache_p.h \
qopengltextureuploader_p.h \
+ qopenglvertexarrayobject.h \
qopenglwindow.h \
qtopenglglobal.h
@@ -49,6 +50,7 @@ SOURCES += \
qopengltexturecache.cpp \
qopengltextureglyphcache.cpp \
qopengltextureuploader.cpp \
+ qopenglvertexarrayobject.cpp \
qopenglwindow.cpp \
qopengldebug.cpp
diff --git a/src/opengl/qopengltextureblitter.cpp b/src/opengl/qopengltextureblitter.cpp
index 6f0ee863d7..c695ae626d 100644
--- a/src/opengl/qopengltextureblitter.cpp
+++ b/src/opengl/qopengltextureblitter.cpp
@@ -40,8 +40,8 @@
#include "qopengltextureblitter.h"
#include <QtOpenGL/QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLBuffer>
-#include <QtGui/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions>
diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/opengl/qopenglvertexarrayobject.cpp
index f15fe06ee8..a6ac282d4c 100644
--- a/src/gui/opengl/qopenglvertexarrayobject.cpp
+++ b/src/opengl/qopenglvertexarrayobject.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
** 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
@@ -315,7 +315,7 @@ void QOpenGLVertexArrayObjectPrivate::release()
/*!
\class QOpenGLVertexArrayObject
\brief The QOpenGLVertexArrayObject class wraps an OpenGL Vertex Array Object.
- \inmodule QtGui
+ \inmodule QtOpenGL
\since 5.1
\ingroup painting-3D
@@ -473,7 +473,7 @@ void QOpenGLVertexArrayObject::release()
\class QOpenGLVertexArrayObject::Binder
\brief The QOpenGLVertexArrayObject::Binder class is a convenience class to help
with the binding and releasing of OpenGL Vertex Array Objects.
- \inmodule QtGui
+ \inmodule QtOpenGL
\reentrant
\since 5.1
\ingroup painting-3D
diff --git a/src/gui/opengl/qopenglvertexarrayobject.h b/src/opengl/qopenglvertexarrayobject.h
index b81ae6a2a9..0675c844e9 100644
--- a/src/gui/opengl/qopenglvertexarrayobject.h
+++ b/src/opengl/qopenglvertexarrayobject.h
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
** 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 QOPENGLVERTEXARRAYOBJECT_H
#define QOPENGLVERTEXARRAYOBJECT_H
-#include <QtGui/qtguiglobal.h>
+#include <QtOpenGL/qtopenglglobal.h>
#ifndef QT_NO_OPENGL
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLVertexArrayObjectPrivate;
-class Q_GUI_EXPORT QOpenGLVertexArrayObject : public QObject
+class Q_OPENGL_EXPORT QOpenGLVertexArrayObject : public QObject
{
Q_OBJECT
@@ -66,7 +66,7 @@ public:
void bind();
void release();
- class Q_GUI_EXPORT Binder
+ class Q_OPENGL_EXPORT Binder
{
public:
inline Binder(QOpenGLVertexArrayObject *v)
diff --git a/src/gui/opengl/qopenglvertexarrayobject_p.h b/src/opengl/qopenglvertexarrayobject_p.h
index fd3a6f0f89..0d0fca4d81 100644
--- a/src/gui/opengl/qopenglvertexarrayobject_p.h
+++ b/src/opengl/qopenglvertexarrayobject_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
** 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,9 +51,7 @@
// We mean it.
//
-#include <QtCore/qglobal.h>
-
-#ifndef QT_NO_OPENGL
+#include <QtOpenGL/qtopenglglobal.h>
#include <QtGui/qopengl.h>
@@ -62,7 +60,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLVertexArrayObjectHelper;
class QOpenGLContext;
-void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
+void Q_OPENGL_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
class QOpenGLVertexArrayObjectHelper
{
@@ -104,7 +102,7 @@ public:
}
private:
- friend void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
+ friend void Q_OPENGL_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
// Function signatures are equivalent between desktop core, ARB, APPLE, ES 3 and ES 2 extensions
typedef void (QOPENGLF_APIENTRYP qt_GenVertexArrays_t)(GLsizei n, GLuint *arrays);
@@ -120,6 +118,4 @@ private:
QT_END_NAMESPACE
-#endif // QT_NO_OPENGL
-
#endif // QOPENGLVERTEXARRAYOBJECT_P_H
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 4fed525392..896b8cd3e8 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -84,6 +84,8 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES
api/qeglfscontext.cpp api/qeglfscontext_p.h
api/qeglfscursor.cpp api/qeglfscursor_p.h
+ PUBLIC_LIBRARIES
+ Qt::OpenGLPrivate
)
#####################################################################
## QEglFSIntegrationPlugin Plugin:
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 03de79d6f0..0078c1f0d7 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -80,6 +80,8 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES
api/qeglfscontext.cpp api/qeglfscontext_p.h
api/qeglfscursor.cpp api/qeglfscursor_p.h
+ PUBLIC_LIBRARIES
+ Qt::OpenGLPrivate
)
#####################################################################
## QEglFSIntegrationPlugin Plugin:
diff --git a/src/plugins/platforms/eglfs/api/api.pri b/src/plugins/platforms/eglfs/api/api.pri
index 68965b58d8..bcb72c9ea7 100644
--- a/src/plugins/platforms/eglfs/api/api.pri
+++ b/src/plugins/platforms/eglfs/api/api.pri
@@ -15,6 +15,7 @@ HEADERS += $$PWD/qeglfswindow_p.h \
$$PWD/qeglfsglobal_p.h
qtConfig(opengl) {
+ QT += opengl-private
SOURCES += \
$$PWD/qeglfscursor.cpp \
$$PWD/qeglfscontext.cpp
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
index 98e05195ee..b8bd7e038b 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
@@ -50,7 +50,7 @@
#include <QtCore/QJsonObject>
#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/private/qopenglvertexarrayobject_p.h>
+#include <QtOpenGL/private/qopenglvertexarrayobject_p.h>
#ifndef GL_VERTEX_ARRAY_BINDING
#define GL_VERTEX_ARRAY_BINDING 0x85B5
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index 03508056f3..2ca844cf1b 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -30,10 +30,10 @@
#include <QtOpenGL/QOpenGLPaintDevice>
#include <QtOpenGL/QOpenGLTexture>
#include <QtOpenGL/qopengltextureblitter.h>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLFunctions_4_2_Core>
-#include <QtGui/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLBuffer>
#include <QtGui/QPainter>
#include <QtGui/QScreen>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:18:55 +0000