diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:22:41 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 16:22:09 +0100 |
| commit | 64bda9d91588c9d8d22a16a41c28d845ab6a935e (patch) | |
| tree | 1b367cec09f4c62097b423bbf602885214730e40 | |
| parent | 8185da097a2eefb7401419a9b2c1d1f05c2364bf (diff) | |
CMake: Regenerate projects after harfbuzz-ng macOS adjustment
Amends 21c242f9fd27523d0016b821d0a962231c4bafa6
Change-Id: I1041d27d2ab764950b574ff729d987b5efe5f2fe
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 2 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index 1cdc8bafc0..e45d101dec 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -70,13 +70,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) ## 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: # SHAPERS = "coretext" @@ -158,17 +151,6 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype 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 SOURCES src/hb-fallback-shape.cc diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 07e0fdf836..c1925ad988 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -71,13 +71,6 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz) ## 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: # SHAPERS = "coretext" @@ -159,17 +152,6 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case 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 SOURCES src/hb-fallback-shape.cc diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index d60945cee3..5d31f4c33a 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -214,7 +214,7 @@ qt_add_module(Core tools/qsimd.cpp tools/qsimd_p.h tools/qsize.cpp tools/qsize.h tools/qstack.h - tools/qtaggedpointer_p.h + tools/qtaggedpointer.h tools/qtools_p.h tools/qvarlengtharray.h tools/qvector.h |