diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-12-11 14:50:40 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-22 09:40:59 +0100 |
| commit | f3ecda32e0f7bd21b44e7737d2939dcce2c26517 (patch) | |
| tree | a9e51f4d507b3b0d92a742157e3c654999cde2fa /tests | |
| parent | 06bb315beb6c2c398223cfe52cbc7f66e14a8557 (diff) | |
Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGL
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/qopengl/qopengl.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/qopengl/tst_qopengl.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/other/lancelot/lancelot.pro | 1 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/gui/painting/lancebench/lancebench.pro | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro index 722c99ee0b..604aa59d8a 100644 --- a/tests/auto/gui/qopengl/qopengl.pro +++ b/tests/auto/gui/qopengl/qopengl.pro @@ -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 diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index ede1e58a53..3b39c8c474 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -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> diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro index 6ece7315ed..5b9117983a 100644 --- a/tests/auto/other/lancelot/lancelot.pro +++ b/tests/auto/other/lancelot/lancelot.pro @@ -1,6 +1,7 @@ CONFIG += testcase TARGET = tst_lancelot QT += testlib gui-private +qtConfig(opengl): QT += opengl SOURCES += tst_lancelot.cpp \ paintcommands.cpp diff --git a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro index 039f5a71b8..f78dc510bf 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro +++ b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro @@ -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 diff --git a/tests/benchmarks/gui/painting/lancebench/lancebench.pro b/tests/benchmarks/gui/painting/lancebench/lancebench.pro index 6458c50861..5647d26de3 100644 --- a/tests/benchmarks/gui/painting/lancebench/lancebench.pro +++ b/tests/benchmarks/gui/painting/lancebench/lancebench.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_bench_lancebench QT += testlib gui-private - +qtConfig(opengl): QT += opengl SOURCES += tst_lancebench.cpp |