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

Manual tests: Port diaglib from QGL to QOpenGL

Browse Source 
Task-number: QTBUG-74408
Change-Id: I25dedd69c6927e5d627f8104c404e23ce68487d9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2020-02-19 11:14:46 +01:00
parent 963017f588
commit d2068b24e4
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/diaglib/diaglib.pri
View File

@ -38,7 +38,7 @@ contains(QT, opengl) {
SOURCES += \
$$PWD/glinfo.cpp
QT += opengl
QT += opengl openglwidgets
}
DEFINES += QT_DIAG_LIB

17
tests/manual/diaglib/glinfo.cpp
View File

@ -28,12 +28,11 @@
#include "glinfo.h"
#include <QtOpenGL/QGLFunctions>
#include <QtOpenGL/QGLWidget>
#include <QOpenGLFunctions>
#include <QtOpenGLWidgets/QOpenGLWidget>
#if QT_VERSION > 0x050000
# if QT_VERSION >= 0x050400
# include <QtWidgets/QOpenGLWidget>
# include <QtGui/QOpenGLWindow>
# include <QtOpenGL/QOpenGLWindow>
# else // 5.4
# include <QtGui/QWindow>
# endif // 5.0..5.4
@ -63,11 +62,6 @@ static QString glInfo(const QOpenGLContext *ctx)
+ getGlString(ctx, GL_RENDERER);
}
static QString glInfo(const QGLContext *ctx)
{
return glInfo(ctx->contextHandle());
}
QString glInfo(const QObject *o)
{
# if QT_VERSION >= 0x050400
@ -76,11 +70,8 @@ QString glInfo(const QObject *o)
return glInfo(oglw->context());
return QString();
}
# endif // 5.4
if (o->isWidgetType()) {
if (const QGLWidget *g = qobject_cast<const QGLWidget *>(o))
return glInfo(g->context());
# if QT_VERSION >= 0x050400
if (const QOpenGLWidget *g = qobject_cast<const QOpenGLWidget *>(o))
return glInfo(g->context());
# endif // 5.4

2
tests/manual/foreignwindows/foreignwindows.pro
View File

@ -1,5 +1,5 @@
TEMPLATE = app
QT += widgets
QT += widgets opengl
CONFIG += cmdline c++11
SOURCES += main.cpp
include(../diaglib/diaglib.pri)