From 36abcc7cbee6e03daeb99c0c94c52d90eefb512c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 12 Nov 2019 18:21:08 +0100
Subject: Regenerate tests/auto/opengl

Change-Id: I9bd417ae02db1b6827e09baab301152f3614da80
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/opengl/qgl/CMakeLists.txt          | 13 ++++++++++---
 tests/auto/opengl/qglbuffer/CMakeLists.txt    | 22 +++++++++++++++++++++-
 tests/auto/opengl/qglfunctions/CMakeLists.txt | 22 +++++++++++++++++++++-
 tests/auto/opengl/qglthreads/CMakeLists.txt   | 23 ++++++++++++++++++++---
 4 files changed, 72 insertions(+), 8 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/opengl/qgl/CMakeLists.txt b/tests/auto/opengl/qgl/CMakeLists.txt
index 8d640a6f52..6af8834473 100644
--- a/tests/auto/opengl/qgl/CMakeLists.txt
+++ b/tests/auto/opengl/qgl/CMakeLists.txt
@@ -1,11 +1,14 @@
 # Generated from qgl.pro.
 
+if(NOT TARGET Qt::OpenGL)
+    return()
+endif()
+
 #####################################################################
 ## tst_qgl Test:
 #####################################################################
 
 add_qt_test(tst_qgl
-    GUI
     SOURCES
         tst_qgl.cpp
     LIBRARIES
@@ -23,13 +26,17 @@ add_qt_test(tst_qgl
 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
-        ../../gui/image/qpixmap/images/designer.png
+        ${qgl_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:qgl.pro:<TRUE>:
-# CONFIG = "testcase"
+# _REQUIREMENTS = "qtHaveModule(opengl)"
diff --git a/tests/auto/opengl/qglbuffer/CMakeLists.txt b/tests/auto/opengl/qglbuffer/CMakeLists.txt
index 96296846b4..f494115638 100644
--- a/tests/auto/opengl/qglbuffer/CMakeLists.txt
+++ b/tests/auto/opengl/qglbuffer/CMakeLists.txt
@@ -1 +1,21 @@
-add_qt_test("tst_qglbuffer" SOURCES tst_qglbuffer.cpp LIBRARIES Qt::OpenGL Qt::Widgets)
+# 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
index 21a0766ac2..8eb344a8d6 100644
--- a/tests/auto/opengl/qglfunctions/CMakeLists.txt
+++ b/tests/auto/opengl/qglfunctions/CMakeLists.txt
@@ -1 +1,21 @@
-add_qt_test("tst_qglfunctions" SOURCES tst_qglfunctions.cpp LIBRARIES Qt::OpenGL Qt::Widgets)
+# 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)"
diff --git a/tests/auto/opengl/qglthreads/CMakeLists.txt b/tests/auto/opengl/qglthreads/CMakeLists.txt
index 0564fe3e6f..b9c47e7ead 100644
--- a/tests/auto/opengl/qglthreads/CMakeLists.txt
+++ b/tests/auto/opengl/qglthreads/CMakeLists.txt
@@ -1,7 +1,24 @@
-add_qt_test("tst_qglthreads" SOURCES tst_qglthreads.cpp tst_qglthreads.h
+# Generated from qglthreads.pro.
+
+if(NOT TARGET Qt::OpenGL)
+    return()
+endif()
+
+#####################################################################
+## tst_qglthreads Test:
+#####################################################################
+
+add_qt_test(tst_qglthreads
+    SOURCES
+        tst_qglthreads.cpp tst_qglthreads.h
     LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::OpenGL
         Qt::Widgets
-        Qt::GuiPrivate
-        Qt::CorePrivate
 )
+
+#### Keys ignored in scope 1:.:.:qglthreads.pro:<TRUE>:
+# _REQUIREMENTS = "qtHaveModule(opengl)"
-- 
cgit v1.2.3