summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-08-05 12:54:27 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-10 11:44:19 +0000
commitc0e82c78cbe3b65b2cd5e3e36bfa005d496eb1bb (patch)
tree501fe3312d8c1d20ae63100de43f8e347801e35b
parente1eda9e8f9abe787038105986aa79ec483440699 (diff)
CMake: Use renamed qt6_add_plugin PLUGIN_TYPE option
Task-number: QTBUG-95170 Change-Id: I0dbbca4cd7f50af9b4aa192a05514f28b6f9658b Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit bd7bdb9e77c6f70ba421def5a00b87c073ffae07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/geometryloaders/default/CMakeLists.txt2
-rw-r--r--src/plugins/geometryloaders/fbx/CMakeLists.txt2
-rw-r--r--src/plugins/geometryloaders/gltf/CMakeLists.txt2
-rw-r--r--src/plugins/renderers/opengl/CMakeLists.txt2
-rw-r--r--src/plugins/renderers/rhi/CMakeLists.txt2
-rw-r--r--src/plugins/renderplugins/scene2d/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/assimp/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/gltf/CMakeLists.txt2
-rw-r--r--src/plugins/sceneparsers/gltfexport/CMakeLists.txt2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/geometryloaders/default/CMakeLists.txt b/src/plugins/geometryloaders/default/CMakeLists.txt
index 0a71866f3..c838a54d9 100644
--- a/src/plugins/geometryloaders/default/CMakeLists.txt
+++ b/src/plugins/geometryloaders/default/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(DefaultGeometryLoaderPlugin
OUTPUT_NAME defaultgeometryloader
- TYPE geometryloaders
+ PLUGIN_TYPE geometryloaders
SOURCES
basegeometryloader.cpp basegeometryloader_p.h
main.cpp
diff --git a/src/plugins/geometryloaders/fbx/CMakeLists.txt b/src/plugins/geometryloaders/fbx/CMakeLists.txt
index ebed007d9..f66f2b76b 100644
--- a/src/plugins/geometryloaders/fbx/CMakeLists.txt
+++ b/src/plugins/geometryloaders/fbx/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(fbxGeometryLoaderPlugin
OUTPUT_NAME fbxgeometryloader
- TYPE geometryloaders
+ PLUGIN_TYPE geometryloaders
SOURCES
fbxgeometryloader.cpp fbxgeometryloader.h
main.cpp
diff --git a/src/plugins/geometryloaders/gltf/CMakeLists.txt b/src/plugins/geometryloaders/gltf/CMakeLists.txt
index 6451ffeaf..8592d4cf8 100644
--- a/src/plugins/geometryloaders/gltf/CMakeLists.txt
+++ b/src/plugins/geometryloaders/gltf/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(GLTFGeometryLoaderPlugin
OUTPUT_NAME gltfgeometryloader
- TYPE geometryloaders
+ PLUGIN_TYPE geometryloaders
SOURCES
gltfgeometryloader.cpp gltfgeometryloader.h
main.cpp
diff --git a/src/plugins/renderers/opengl/CMakeLists.txt b/src/plugins/renderers/opengl/CMakeLists.txt
index 36d43833f..de485138a 100644
--- a/src/plugins/renderers/opengl/CMakeLists.txt
+++ b/src/plugins/renderers/opengl/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
qt_internal_add_plugin(OpenGLRendererPlugin
OUTPUT_NAME openglrenderer
- TYPE renderers
+ PLUGIN_TYPE renderers
SOURCES
main.cpp
${openGLRendererSources}
diff --git a/src/plugins/renderers/rhi/CMakeLists.txt b/src/plugins/renderers/rhi/CMakeLists.txt
index 7051088b4..fb11c5730 100644
--- a/src/plugins/renderers/rhi/CMakeLists.txt
+++ b/src/plugins/renderers/rhi/CMakeLists.txt
@@ -66,7 +66,7 @@ endif()
qt_internal_add_plugin(RhiRendererPlugin
OUTPUT_NAME rhirenderer
- TYPE renderers
+ PLUGIN_TYPE renderers
SOURCES
main.cpp
${rhiRendererSources}
diff --git a/src/plugins/renderplugins/scene2d/CMakeLists.txt b/src/plugins/renderplugins/scene2d/CMakeLists.txt
index a53ffe14f..a46ca15d9 100644
--- a/src/plugins/renderplugins/scene2d/CMakeLists.txt
+++ b/src/plugins/renderplugins/scene2d/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(Scene2DPlugin
OUTPUT_NAME scene2d
- TYPE renderplugins
+ PLUGIN_TYPE renderplugins
SOURCES
main.cpp
scene2dplugin.cpp scene2dplugin.h
diff --git a/src/plugins/sceneparsers/assimp/CMakeLists.txt b/src/plugins/sceneparsers/assimp/CMakeLists.txt
index f22fe6e98..18bb83d56 100644
--- a/src/plugins/sceneparsers/assimp/CMakeLists.txt
+++ b/src/plugins/sceneparsers/assimp/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(AssimpSceneImportPlugin
OUTPUT_NAME assimpsceneimport
- TYPE sceneparsers
+ PLUGIN_TYPE sceneparsers
EXCEPTIONS # special case
SOURCES
assimphelpers.cpp assimphelpers.h
diff --git a/src/plugins/sceneparsers/gltf/CMakeLists.txt b/src/plugins/sceneparsers/gltf/CMakeLists.txt
index ac11ff716..67a092a93 100644
--- a/src/plugins/sceneparsers/gltf/CMakeLists.txt
+++ b/src/plugins/sceneparsers/gltf/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(GLTFSceneImportPlugin
OUTPUT_NAME gltfsceneimport
- TYPE sceneparsers
+ PLUGIN_TYPE sceneparsers
SOURCES
gltfimporter.cpp gltfimporter.h
main.cpp
diff --git a/src/plugins/sceneparsers/gltfexport/CMakeLists.txt b/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
index d915fbdd1..4c4e9c280 100644
--- a/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
+++ b/src/plugins/sceneparsers/gltfexport/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(GLTFSceneExportPlugin
OUTPUT_NAME gltfsceneexport
- TYPE sceneparsers
+ PLUGIN_TYPE sceneparsers
SOURCES
gltfexporter.cpp gltfexporter.h
main.cpp