From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 22 Sep 2020 10:16:58 +0200
Subject: CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/opengl/.prev_CMakeLists.txt | 14 +++++++-------
 src/opengl/CMakeLists.txt       | 15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/opengl')

diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index 1d8544ab8e..a6e2e56561 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpenGL Module:
 #####################################################################
 
-qt_add_module(OpenGL
+qt_internal_add_module(OpenGL
     SOURCES
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
         qopenglbuffer.cpp qopenglbuffer.h
@@ -49,12 +49,12 @@ qt_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_es2.cpp qopenglfunctions_es2.h
 )
 
-qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h
         qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h
@@ -86,22 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopengltimerquery.cpp qopengltimerquery.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
     SOURCES
         qvkconvenience.cpp qvkconvenience_p.h
     PUBLIC_LIBRARIES
         Vulkan::Vulkan_nolink
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
         qopenglcompositor.cpp qopenglcompositor_p.h
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
 
-qt_create_tracepoints(OpenGL qtopengl.tracepoints)
-qt_add_docs(OpenGL
+qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints)
+qt_internal_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
 
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 781301dc0f..a6e2e56561 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## OpenGL Module:
 #####################################################################
 
-qt_add_module(OpenGL
+qt_internal_add_module(OpenGL
     SOURCES
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
         qopenglbuffer.cpp qopenglbuffer.h
@@ -49,12 +49,12 @@ qt_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_es2.cpp qopenglfunctions_es2.h
 )
 
-qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h
         qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h
@@ -86,21 +86,22 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopengltimerquery.cpp qopengltimerquery.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
     SOURCES
         qvkconvenience.cpp qvkconvenience_p.h
     PUBLIC_LIBRARIES
         Vulkan::Vulkan_nolink
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
+qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
         qopenglcompositor.cpp qopenglcompositor_p.h
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
-qt_create_tracepoints(OpenGL qtopengl.tracepoints)
-qt_add_docs(OpenGL
+
+qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints)
+qt_internal_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
 
-- 
cgit v1.2.3