diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-11-22 17:05:29 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-11-22 18:03:20 +0000 |
| commit | a640db0180f5217f8dc45687c27ea615ea013ca2 (patch) | |
| tree | 526074ce460059c623988f3a32ae5c2433196738 | |
| parent | 974536c4aae7766560a3251d82c3519fc78b3cd7 (diff) | |
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
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/openglextensions/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | util/cmake/helper.py | 11 |
3 files changed, 29 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13a4e461ce..e7a8255029 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 0000000000..d2fc027398 --- /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 3a48f63de2..f0fa9d5287 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( - "quick3dextras", "Qt6", "Qt::3DQuickExtras", extra=["COMPONENTS", "3DQuickExtras"] + "quick3drender", "Qt6", "Qt::Quick3DRender", extra=["COMPONENTS", "Quick3DRender"] ), - 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"] |