qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Pick-to: 6.4 6.5
Change-Id: I98d000e839dd0cb0aad862b66bfe8b9725a13744
Reviewed-by: Mike Krus <mike.krus@kdab.com>
This commit is contained in:
Paul Lemire 2022-12-14 06:55:47 +01:00
parent df4665a61f
commit aee00ddfb3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -16,7 +16,7 @@ project(Qt3D # special case
# special case begin # special case begin
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS 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 # special case end
if(NOT TARGET Qt::Gui) if(NOT TARGET Qt::Gui)

4
tests/manual/CMakeLists.txt
View File

@ -22,10 +22,10 @@ add_subdirectory(manual-renderloop)
add_subdirectory(rhi) add_subdirectory(rhi)
add_subdirectory(boundingvolumes) add_subdirectory(boundingvolumes)
if(TARGET Qt::Multimedia) if(TARGET Qt::Multimedia)
add_subdirectory(sharedtexture) # add_subdirectory(sharedtexture)
endif() endif()
if(TARGET Qt::Multimedia AND TARGET Qt::Quick) if(TARGET Qt::Multimedia AND TARGET Qt::Quick)
add_subdirectory(sharedtextureqml) # add_subdirectory(sharedtextureqml)
endif() endif()
if(TARGET Qt::Widgets) if(TARGET Qt::Widgets)
add_subdirectory(assimp-cpp) add_subdirectory(assimp-cpp)