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

Move QOpenGLDebugLogger from QtGui to QtOpenGL

Browse Source 
Task-number: QTBUG-74409
Change-Id: Ida7a89b214cd5e1a3b6fdfa651299a9c5a654f5b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-12-10 13:01:45 +01:00
parent f08038fca7
commit c3a66baff8
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.h \ opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \ opengl/qopenglversionfunctionsfactory_p.h \
opengl/qopenglvertexarrayobject.h \ opengl/qopenglvertexarrayobject.h \
opengl/qopengldebug.h \
opengl/qopengltextureblitter.h \ opengl/qopengltextureblitter.h \
opengl/qopengltexture.h \ opengl/qopengltexture.h \
opengl/qopengltexture_p.h \ opengl/qopengltexture_p.h \
@ -53,7 +52,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.cpp \ opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \ opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp \ opengl/qopenglvertexarrayobject.cpp \
opengl/qopengldebug.cpp \
opengl/qopengltextureblitter.cpp \ opengl/qopengltextureblitter.cpp \
opengl/qopengltexture.cpp \ opengl/qopengltexture.cpp \
opengl/qopengltexturehelper.cpp \ opengl/qopengltexturehelper.cpp \

4
src/opengl/opengl.pro
View File

@ -9,6 +9,10 @@ qtConfig(opengl): CONFIG += opengl
qtConfig(opengles2): CONFIG += opengles2 qtConfig(opengles2): CONFIG += opengles2
HEADERS += \ HEADERS += \
qopengldebug.h \
qtopenglglobal.h qtopenglglobal.h
SOURCES += \
qopengldebug.cpp
load(qt_module) load(qt_module)

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

@ -3,7 +3,7 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> ** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage
@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\class QOpenGLDebugMessage \class QOpenGLDebugMessage
\brief The QOpenGLDebugMessage class wraps an OpenGL debug message. \brief The QOpenGLDebugMessage class wraps an OpenGL debug message.
\inmodule QtGui \inmodule QtOpenGL
\reentrant \reentrant
\since 5.1 \since 5.1
\ingroup shared \ingroup shared
@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
/*! /*!
\class QOpenGLDebugLogger \class QOpenGLDebugLogger
\brief The QOpenGLDebugLogger enables logging of OpenGL debugging messages. \brief The QOpenGLDebugLogger enables logging of OpenGL debugging messages.
\inmodule QtGui \inmodule QtOpenGL
\since 5.1 \since 5.1
\ingroup painting-3D \ingroup painting-3D

16
src/gui/opengl/qopengldebug.h → src/opengl/qopengldebug.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> ** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage
@ -40,7 +40,7 @@
#ifndef QOPENGLDEBUG_H #ifndef QOPENGLDEBUG_H
#define QOPENGLDEBUG_H #define QOPENGLDEBUG_H
#include <QtGui/qtguiglobal.h> #include <QtOpenGL/qtopenglglobal.h>
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
@ -63,7 +63,7 @@ class QOpenGLDebugLogger;
class QOpenGLDebugLoggerPrivate; class QOpenGLDebugLoggerPrivate;
class QOpenGLDebugMessagePrivate; class QOpenGLDebugMessagePrivate;
class Q_GUI_EXPORT QOpenGLDebugMessage class Q_OPENGL_EXPORT QOpenGLDebugMessage
{ {
public: public:
enum Source { enum Source {
@ -145,15 +145,15 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Types)
Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Severities) Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Severities)
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message); Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source); Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type); Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity); Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity);
#endif #endif
class QOpenGLDebugLoggerPrivate; class QOpenGLDebugLoggerPrivate;
class Q_GUI_EXPORT QOpenGLDebugLogger : public QObject class Q_OPENGL_EXPORT QOpenGLDebugLogger : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(LoggingMode loggingMode READ loggingMode) Q_PROPERTY(LoggingMode loggingMode READ loggingMode)