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

Revert "Android: Fix compile on arm64"

Browse Source 
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>
This commit is contained in:
BogDan Vatra 2016-01-21 11:08:59 +02:00 committed by Konstantin Ritt
parent 6fea5b4dd8
commit c0538d5ff3
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,11 +85,6 @@ qt_extend_target(BundledHarfbuzz CONDITION WIN32
HB_NO_WIN1256 HB_NO_WIN1256
) )
qt_extend_target(BundledHarfbuzz CONDITION ANDROID
DEFINES
_POSIX_C_SOURCE=200112L
)
qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
SOURCES SOURCES
src/hb-ot.h src/hb-ot.h

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

@ -86,11 +86,6 @@ qt_extend_target(BundledHarfbuzz CONDITION WIN32
HB_NO_WIN1256 HB_NO_WIN1256
) )
qt_extend_target(BundledHarfbuzz CONDITION ANDROID
DEFINES
_POSIX_C_SOURCE=200112L
)
qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
SOURCES SOURCES
src/hb-ot.h src/hb-ot.h

3
src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro vendored
View File

@ -28,9 +28,6 @@ DEFINES += HAVE_ATEXIT
unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD
win32: DEFINES += HB_NO_WIN1256 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) # Harfbuzz-NG inside Qt uses the Qt atomics (inline code only)
INCLUDEPATH += $$QT.core.includes INCLUDEPATH += $$QT.core.includes
DEFINES += QT_NO_VERSION_TAGGING DEFINES += QT_NO_VERSION_TAGGING