diff options
Diffstat (limited to 'tests')
6 files changed, 19 insertions, 3 deletions
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt index d488c808f9..30c1ec94b3 100644 --- a/tests/auto/gui/qopengl/CMakeLists.txt +++ b/tests/auto/gui/qopengl/CMakeLists.txt @@ -12,6 +12,7 @@ add_qt_test(tst_qopengl Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL ) ## Scopes: diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt index 974112a5ad..f06586d3d4 100644 --- a/tests/auto/other/lancelot/CMakeLists.txt +++ b/tests/auto/other/lancelot/CMakeLists.txt @@ -73,8 +73,13 @@ add_qt_resource(tst_lancelot "images" ## Scopes: ##################################################################### -#### Keys ignored in scope 3:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: +extend_target(tst_lancelot CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) + +#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32: # MKSPEC = "$$replace(QMAKESPEC, \\\\, /)" -#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: +#### Keys ignored in scope 5:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else: # MKSPEC = "$$QMAKESPEC" diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 37088f8495..1f5bb2dff8 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -10,6 +10,7 @@ add_qt_test(tst_qopenglwidget LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::OpenGLPrivate PUBLIC_LIBRARIES Qt::Gui Qt::OpenGL diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index e3b60c0827..a4c673af9b 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -148,3 +148,11 @@ add_qt_resource(tst_bench_lancebench "images" #### Keys ignored in scope 1:.:.:lancebench.pro:<TRUE>: # TEMPLATE = "app" # TESTDATA = "../../../../auto/other/lancelot/scripts/*" + +## Scopes: +##################################################################### + +extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt index 14d702dc7f..2c18c56d36 100644 --- a/tests/manual/qopengltextureblitter/CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -15,6 +15,7 @@ add_qt_manual_test(qopengltextureblitter Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::OpenGL # special case ) #### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index f4e093a967..f8e033c927 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -29,7 +29,7 @@ #include "qopengltextureblitwindow.h" #include <QtGui/QPainter> -#include <QtGui/QOpenGLTexture> +#include <QtOpenGL/QOpenGLTexture> #include <QtGui/QOpenGLFunctions> #include <QtGui/QMatrix4x4> |