AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up NO_UNITY_BUILD instruction

Browse Source 
We can now use NO_UNITY_BUILD_SOURCES instead, and we only need to
exclude one of the file to avoid the exclusion.

Task-number: QTBUG-109394
Pick-to: 6.5
Change-Id: I33642eece77e362f8a1de7400c14a30da7889239
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-03-29 11:52:21 +02:00
parent 936c3bd224
commit c19504e708
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/direct2d/CMakeLists.txt
View File

@ -47,7 +47,6 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
qwindowsdirect2dwindow.cpp qwindowsdirect2dwindow.h
NO_UNITY_BUILD_SOURCES
../windows/qwindowspointerhandler.cpp
../windows/qwindowsmousehandler.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_FOREACH

6
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -38,6 +38,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
qwindowstheme.cpp qwindowstheme.h
qwindowsthreadpoolrunner.h
qwindowswindow.cpp qwindowswindow.h
NO_UNITY_BUILD_SOURCES
qwindowspointerhandler.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
QT_NO_FOREACH
@ -66,10 +68,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
runtimeobject
)
# Duplicated symbols
set_source_files_properties(qwindowspointerhandler.cpp qwindowsmousehandler.cpp
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
# Resources:
set_source_files_properties("openglblacklists/default.json"
PROPERTIES QT_RESOURCE_ALIAS "default.json"