From a640db0180f5217f8dc45687c27ea615ea013ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Fri, 22 Nov 2019 17:05:29 +0100
Subject: [PATCH] Add parts needed for QtQuick3D

There is a patch in progress to add mappings for Qt3D, so reuse the old
broken Qt3D mappings, delete the duplicates.

QtOpenGLExtensions is needed, so this patch includes it.

Change-Id: I27896ee88b9e6873c8cd52d86afc330e309e1e14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 src/CMakeLists.txt                  |  4 ++++
 src/openglextensions/CMakeLists.txt | 20 ++++++++++++++++++++
 util/cmake/helper.py                | 15 +++++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/openglextensions/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13a4e461ce8..e7a8255029a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,6 +33,10 @@ endif()
 if(QT_FEATURE_gui)
     add_subdirectory(gui)
 
+    if(QT_FEATURE_opengl)
+        add_subdirectory(openglextensions)
+    endif()
+
     if(QT_FEATURE_widgets)
         add_subdirectory(widgets)
         if(QT_FEATURE_opengl)
diff --git a/src/openglextensions/CMakeLists.txt b/src/openglextensions/CMakeLists.txt
new file mode 100644
index 00000000000..d2fc0273981
--- /dev/null
+++ b/src/openglextensions/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from openglextensions.pro.
+
+#####################################################################
+## OpenGLExtensions Module:
+#####################################################################
+
+qt_add_module(OpenGLExtensions
+    STATIC
+    SOURCES
+        qopenglextensions.cpp qopenglextensions.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 3a48f63de24..f0fa9d5287a 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -258,18 +258,17 @@ _qt_library_map = [
         extra=["COMPONENTS", "MultimediaQuick"],
     ),
     LibraryMapping(
-        "quick3danimation", "Qt6", "Qt::3DQuickAnimation", extra=["COMPONENTS", "3DQuickAnimation"]
+        "quick3dassetimport", "Qt6", "Qt::Quick3DAssetImport", extra=["COMPONENTS", "Quick3DAssetImport"]
+    ),
+    LibraryMapping("quick3d", "Qt6", "Qt::Quick3D", extra=["COMPONENTS", "Quick3D"]),
+    LibraryMapping(
+        "quick3drender", "Qt6", "Qt::Quick3DRender", extra=["COMPONENTS", "Quick3DRender"]
     ),
     LibraryMapping(
-        "quick3dextras", "Qt6", "Qt::3DQuickExtras", extra=["COMPONENTS", "3DQuickExtras"]
-    ),
-    LibraryMapping("quick3dinput", "Qt6", "Qt::3DQuickInput", extra=["COMPONENTS", "3DQuickInput"]),
-    LibraryMapping("quick3d", "Qt6", "Qt::3DQuick", extra=["COMPONENTS", "3DQuick"]),
-    LibraryMapping(
-        "quick3drender", "Qt6", "Qt::3DQuickRender", extra=["COMPONENTS", "3DQuickRender"]
+        "quick3druntimerender", "Qt6", "Qt::Quick3DRuntimeRender", extra=["COMPONENTS", "Quick3DRuntimeRender"]
     ),
     LibraryMapping(
-        "quick3dscene2d", "Qt6", "Qt::3DQuickScene2D", extra=["COMPONENTS", "3DQuickScene2D"]
+        "quick3dutils", "Qt6", "Qt::Quick3DUtils", extra=["COMPONENTS", "Quick3DUtils"]
     ),
     LibraryMapping(
         "quickcontrols2", "Qt6", "Qt::QuickControls2", extra=["COMPONENTS", "QuickControls2"]