1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Regenerate projects after harfbuzz-ng macOS adjustment

Browse Source 
Amends 21c242f9fd27523d0016b821d0a962231c4bafa6

Change-Id: I1041d27d2ab764950b574ff729d987b5efe5f2fe
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Alexandru Croitor 2020-03-18 14:22:41 +01:00
parent 8185da097a
commit 64bda9d915
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt vendored
View File

@ -70,13 +70,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(BundledHarfbuzz CONDITION APPLE
SOURCES
src/hb-coretext.cc src/hb-coretext.h
DEFINES
HAVE_CORETEXT
)
#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
# SHAPERS = "coretext" # SHAPERS = "coretext"
@ -158,17 +151,6 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
HAVE_OT HAVE_OT
) )
qt_extend_target(BundledHarfbuzz CONDITION UIKIT
LIBRARIES
${FWCoreGraphics}
${FWCoreText}
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWApplicationServices}
)
qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
SOURCES SOURCES
src/hb-fallback-shape.cc src/hb-fallback-shape.cc

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

@ -71,13 +71,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(BundledHarfbuzz CONDITION APPLE
SOURCES
src/hb-coretext.cc src/hb-coretext.h
DEFINES
HAVE_CORETEXT
)
#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: #### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
# SHAPERS = "coretext" # SHAPERS = "coretext"
@ -159,17 +152,6 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
HAVE_OT HAVE_OT
) )
qt_extend_target(BundledHarfbuzz CONDITION UIKIT
LIBRARIES
${FWCoreGraphics}
${FWCoreText}
)
qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT
LIBRARIES
${FWApplicationServices}
)
qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
SOURCES SOURCES
src/hb-fallback-shape.cc src/hb-fallback-shape.cc

2
src/corelib/.prev_CMakeLists.txt
View File

@ -214,7 +214,7 @@ qt_add_module(Core
tools/qsimd.cpp tools/qsimd_p.h tools/qsimd.cpp tools/qsimd_p.h
tools/qsize.cpp tools/qsize.h tools/qsize.cpp tools/qsize.h
tools/qstack.h tools/qstack.h
tools/qtaggedpointer_p.h tools/qtaggedpointer.h
tools/qtools_p.h tools/qtools_p.h
tools/qvarlengtharray.h tools/qvarlengtharray.h
tools/qvector.h tools/qvector.h