AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move QOpenGLTimerQuery to from QtGui to QtOpenGL

Browse Source 
Task-number: QTBUG-74409
Change-Id: Ic8ef0a814700b2ed76b661d560907ad498334231
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-12-10 13:18:21 +01:00
parent 2a653fde48
commit 026a8ec802
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,7 @@ qtConfig(opengl) {
opengl/qopenglfunctions_4_2_compatibility.h \
opengl/qopenglfunctions_4_3_compatibility.h \
opengl/qopenglfunctions_4_4_compatibility.h \
opengl/qopenglfunctions_4_5_compatibility.h \
opengl/qopenglqueryhelper_p.h \
opengl/qopengltimerquery.h
opengl/qopenglfunctions_4_5_compatibility.h
SOURCES += opengl/qopenglfunctions_1_0.cpp \
opengl/qopenglfunctions_1_1.cpp \
@ -114,8 +112,7 @@ qtConfig(opengl) {
opengl/qopenglfunctions_4_2_compatibility.cpp \
opengl/qopenglfunctions_4_3_compatibility.cpp \
opengl/qopenglfunctions_4_4_compatibility.cpp \
opengl/qopenglfunctions_4_5_compatibility.cpp \
opengl/qopengltimerquery.cpp
opengl/qopenglfunctions_4_5_compatibility.cpp
}
qtConfig(opengles2) {

8
src/opengl/opengl.pro
View File

@ -15,4 +15,12 @@ HEADERS += \
SOURCES += \
qopengldebug.cpp
!qtConfig(opengles2) {
HEADERS += \
qopenglqueryhelper_p.h \
qopengltimerquery.h
SOURCES += qopengltimerquery.cpp
}
load(qt_module)

2
src/gui/opengl/qopenglqueryhelper_p.h → src/opengl/qopenglqueryhelper_p.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
** 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/qopengltimerquery.cpp → src/opengl/qopengltimerquery.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
** 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
@ -238,7 +238,7 @@ GLuint64 QOpenGLTimerQueryPrivate::result() const
/*!
\class QOpenGLTimerQuery
\brief The QOpenGLTimerQuery class wraps an OpenGL timer query object.
\inmodule QtGui
\inmodule QtOpenGL
\since 5.1
\ingroup painting-3D
@ -645,7 +645,7 @@ void QOpenGLTimeMonitorPrivate::reset()
/*!
\class QOpenGLTimeMonitor
\brief The QOpenGLTimeMonitor class wraps a sequence of OpenGL timer query objects.
\inmodule QtGui
\inmodule QtOpenGL
\since 5.1
\ingroup painting-3D

8
src/gui/opengl/qopengltimerquery.h → src/opengl/qopengltimerquery.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
** 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 QOPENGLTIMERQUERY_H
#define QOPENGLTIMERQUERY_H
#include <QtGui/qtguiglobal.h>
#include <QtOpenGL/qtopenglglobal.h>
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLTimerQueryPrivate;
class Q_GUI_EXPORT QOpenGLTimerQuery : public QObject
class Q_OPENGL_EXPORT QOpenGLTimerQuery : public QObject
{
Q_OBJECT
@ -79,7 +79,7 @@ private:
class QOpenGLTimeMonitorPrivate;
class Q_GUI_EXPORT QOpenGLTimeMonitor : public QObject
class Q_OPENGL_EXPORT QOpenGLTimeMonitor : public QObject
{
Q_OBJECT