diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-14 06:55:47 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-20 06:08:35 +0000 |
| commit | c567a3498a479728baea114bead961146f50ed2b (patch) | |
| tree | 862ada9b7ccbcbc5001a26e8522eb18649d341b9 | |
| parent | 8b03714273320d367efa6eaad527973e376006e4 (diff) | |
| download | qt3d-c567a3498a479728baea114bead961146f50ed2b.tar.gz | |
Fix compilation of manual tests
- Disable the examples that use QtMultimedia as they haven't been ported
to QtMultimedia from Qt6
- QTextureDataUpdate forward header doesn't seem to be generated
- Add QuickWidgets in the find_package call so that we can later check
if it is actually available
Change-Id: I98d000e839dd0cb0aad862b66bfe8b9725a13744
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit aee00ddfb3650325df8f67b68885828b0669a017)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fd634b1b..fbd6bb51d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ project(Qt3D # special case # special case begin find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS - Network Concurrent Widgets Qml Quick ShaderTools Gamepad OpenGL Multimedia) + Network Concurrent Widgets Qml Quick ShaderTools Gamepad OpenGL Multimedia QuickWidgets) # special case end if(NOT TARGET Qt::Gui) diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 2b0001483..f36ffd5dc 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -22,10 +22,10 @@ add_subdirectory(manual-renderloop) add_subdirectory(rhi) add_subdirectory(boundingvolumes) if(TARGET Qt::Multimedia) - add_subdirectory(sharedtexture) +# add_subdirectory(sharedtexture) endif() if(TARGET Qt::Multimedia AND TARGET Qt::Quick) - add_subdirectory(sharedtextureqml) +# add_subdirectory(sharedtextureqml) endif() if(TARGET Qt::Widgets) add_subdirectory(assimp-cpp) |