diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-14 06:55:47 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2022-12-20 08:01:10 +0000 |
| commit | 88706e343e122b424afee3a1790720960e792416 (patch) | |
| tree | 3c2371709d7a9a1e5b838c60a8fec3953702b21d | |
| parent | 59f31bce309009de01f757a01c556a157c1a6392 (diff) | |
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: Paul Lemire <paul.lemire@kdab.com>
| -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 fb7804a26..6698f8510 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,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 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 ee06b5b9b..daee80cb7 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -19,10 +19,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) |