From 4dfaa1d60a7a212f8364c1cd287f18b0b8848e36 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 2 Jun 2020 09:05:16 +0200 Subject: [PATCH] Fix build for Android on macOS The FreeType engine has moved out of the fontdatabases library, so the .a file would be empty. This caused the error "attempt to map 60 bytes at offset 72 exceeds size of file" when building for Android on macOS. Change-Id: I9d9afca67e7626d3b5c6a62fcde33fed029fe04c Reviewed-by: Liang Qi --- src/plugins/platforms/android/.prev_CMakeLists.txt | 1 - src/plugins/platforms/android/CMakeLists.txt | 1 - src/plugins/platforms/android/android.pro | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index c18719ec726..9a3b8cc1bbf 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -48,7 +48,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate android diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 42e241dcfa5..8365be32cb2 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -48,7 +48,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate android diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 778e7881cdf..8312fba85d8 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -5,7 +5,7 @@ LIBS += -ljnigraphics -landroid QT += \ core-private gui-private \ eventdispatcher_support-private \ - fontdatabase_support-private egl_support-private + egl_support-private qtConfig(opengl): QT += opengl-private