diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
| commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
| tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /tests/auto/opengl | |
| parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) | |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/opengl')
| -rw-r--r-- | tests/auto/opengl/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/opengl/qgl/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | tests/auto/opengl/qglbuffer/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | tests/auto/opengl/qglfunctions/CMakeLists.txt | 21 |
4 files changed, 0 insertions, 89 deletions
diff --git a/tests/auto/opengl/CMakeLists.txt b/tests/auto/opengl/CMakeLists.txt index 54238c1fa6..7281d56838 100644 --- a/tests/auto/opengl/CMakeLists.txt +++ b/tests/auto/opengl/CMakeLists.txt @@ -1,6 +1 @@ # Generated from opengl.pro. - -add_subdirectory(qgl) -add_subdirectory(qglbuffer) -add_subdirectory(qglfunctions) -add_subdirectory(qglthreads) diff --git a/tests/auto/opengl/qgl/CMakeLists.txt b/tests/auto/opengl/qgl/CMakeLists.txt deleted file mode 100644 index 6af8834473..0000000000 --- a/tests/auto/opengl/qgl/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Generated from qgl.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qgl Test: -##################################################################### - -add_qt_test(tst_qgl - SOURCES - tst_qgl.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::OpenGLPrivate - Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -# Resources: -set_source_files_properties("../../gui/image/qpixmap/images/designer.png" - PROPERTIES QT_RESOURCE_ALIAS "designer.png" -) -set(qgl_resource_files - "../../gui/image/qpixmap/images/designer.png" -) - -add_qt_resource(tst_qgl "qgl" - PREFIX - "/" - FILES - ${qgl_resource_files} -) - - -#### Keys ignored in scope 1:.:.:qgl.pro:<TRUE>: -# _REQUIREMENTS = "qtHaveModule(opengl)" diff --git a/tests/auto/opengl/qglbuffer/CMakeLists.txt b/tests/auto/opengl/qglbuffer/CMakeLists.txt deleted file mode 100644 index f494115638..0000000000 --- a/tests/auto/opengl/qglbuffer/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from qglbuffer.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qglbuffer Test: -##################################################################### - -add_qt_test(tst_qglbuffer - SOURCES - tst_qglbuffer.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:qglbuffer.pro:<TRUE>: -# _REQUIREMENTS = "qtHaveModule(opengl)" diff --git a/tests/auto/opengl/qglfunctions/CMakeLists.txt b/tests/auto/opengl/qglfunctions/CMakeLists.txt deleted file mode 100644 index 8eb344a8d6..0000000000 --- a/tests/auto/opengl/qglfunctions/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Generated from qglfunctions.pro. - -if(NOT TARGET Qt::OpenGL) - return() -endif() - -##################################################################### -## tst_qglfunctions Test: -##################################################################### - -add_qt_test(tst_qglfunctions - SOURCES - tst_qglfunctions.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:qglfunctions.pro:<TRUE>: -# _REQUIREMENTS = "qtHaveModule(opengl)" |