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

Mark the module free of Q_FOREACH ... again 

This restores the QT_NO_FOREACH define originally added in
0570d73b61 and then lost in the cmake
port.

Luckily, no new uses have crept in since then.

Change-Id: Id05d420969ec652ad7bcef419826f904e9e328f7
Reviewed-by: Mike Krus <mike.krus@kdab.com>
This commit is contained in:
Marc Mutz 2023-08-03 21:41:34 +02:00
parent 7cfad720a8
commit c59cde27f0
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cmake.conf
View File

@ -4,3 +4,4 @@ set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_REPO_PUBLIC_NAMESPACE_REGEX "^::Qt3D.*")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")

2
src/plugins/renderers/opengl/CMakeLists.txt
View File

@ -71,7 +71,6 @@ if(QT_FEATURE_private_tests)
target_compile_definitions(OpenGLRendererLib PRIVATE
BUILD_QT3D_MODULE
QT_BUILDING_QT
QT_NO_FOREACH
QT_NO_CONTEXTLESS_CONNECT
)
@ -102,7 +101,6 @@ qt_internal_add_plugin(OpenGLRendererPlugin
BUILD_QT3D_MODULE
QT_BUILDING_QT
QT_NO_CONTEXTLESS_CONNECT
QT_NO_FOREACH
INCLUDE_DIRECTORIES
graphicshelpers
io

2
src/plugins/renderers/rhi/CMakeLists.txt
View File

@ -56,7 +56,6 @@ if(QT_FEATURE_private_tests)
target_compile_definitions(RhiRendererLib PRIVATE
BUILD_QT3D_MODULE
QT_BUILDING_QT
QT_NO_FOREACH
)
endif()
@ -75,7 +74,6 @@ qt_internal_add_plugin(RhiRendererPlugin
BUILD_QT3D_MODULE
QT_BUILDING_QT
QT_NO_CONTEXTLESS_CONNECT
QT_NO_FOREACH QT_NO_FOREACH
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
graphicshelpers