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

Merge "CMake: Make Platform a dependency for all Qt internal targets"

Browse Source
This commit is contained in:
Alexandru Croitor 2021-03-17 15:39:01 +01:00 committed by Qt CI Bot
commit ea5cc229e2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtInternalTargets.cmake
View File

@ -72,6 +72,7 @@ endfunction()
add_library(PlatformCommonInternal INTERFACE)
add_library(Qt::PlatformCommonInternal ALIAS PlatformCommonInternal)
target_link_libraries(PlatformCommonInternal INTERFACE Platform)
add_library(PlatformModuleInternal INTERFACE)
add_library(Qt::PlatformModuleInternal ALIAS PlatformModuleInternal)

4
cmake/QtPublicTargetsHelpers.cmake
View File

@ -1,5 +1,5 @@
# Defines the public Qt::Platform target, which is used by both internal Qt builds as well as
# public Qt consuming projects.
# Defines the public Qt::Platform target, which serves as a dependency for all internal Qt target
# as well as user projects consuming Qt.
function(qt_internal_setup_public_platform_target)
## QtPlatform Target:
add_library(Platform INTERFACE)

1
src/3rdparty/harfbuzz-ng/CMakeLists.txt vendored
View File

@ -65,7 +65,6 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
)
qt_disable_warnings(BundledHarfbuzz)
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
qt_set_msvc_cplusplus_options(BundledHarfbuzz PRIVATE)
#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
# OTHER_FILES = "$$PWD/src/harfbuzz.cc"