diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-01-21 11:08:59 +0200 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2020-03-26 01:57:11 +0300 |
| commit | c0538d5ff39b086d40fed943729b26aa3d17b602 (patch) | |
| tree | 943fcf72689a417c1aa7bf13e7063dfc503a6978 /src/3rdparty | |
| parent | 6fea5b4dd838bd8e49fdc445b851ba8cdd3635ef (diff) | |
Revert "Android: Fix compile on arm64"
This reverts commit 81d6906ad9fa8ad3f73b151a1e8564ffaeccc3cf.
Fixed upstream. \sa https://github.com/harfbuzz/harfbuzz/issues/1308
Change-Id: I7759e2bb199ffd11d42239be59704c4e1f7ddb9f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index e45d101dec..c2b1b6c9ae 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -85,11 +85,6 @@ qt_extend_target(BundledHarfbuzz CONDITION WIN32 HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION ANDROID - DEFINES - _POSIX_C_SOURCE=200112L -) - qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype SOURCES src/hb-ot.h diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index c1925ad988..38381f747d 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -86,11 +86,6 @@ qt_extend_target(BundledHarfbuzz CONDITION WIN32 HB_NO_WIN1256 ) -qt_extend_target(BundledHarfbuzz CONDITION ANDROID - DEFINES - _POSIX_C_SOURCE=200112L -) - qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case SOURCES src/hb-ot.h diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 24205dff34..1c6eb992f0 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -28,9 +28,6 @@ DEFINES += HAVE_ATEXIT unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD win32: DEFINES += HB_NO_WIN1256 -#Workaround https://code.google.com/p/android/issues/detail?id=194631 -android: DEFINES += _POSIX_C_SOURCE=200112L - # Harfbuzz-NG inside Qt uses the Qt atomics (inline code only) INCLUDEPATH += $$QT.core.includes DEFINES += QT_NO_VERSION_TAGGING |