diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-02 09:05:16 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-06-03 16:39:39 +0300 |
| commit | 4dfaa1d60a7a212f8364c1cd287f18b0b8848e36 (patch) | |
| tree | 2cf50db95d9ba2e9cc1de0673138be465f59081b /src/plugins/platforms/android | |
| parent | 7ede57f937f988780d6751da34c941447ec6fd32 (diff) | |
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 <liang.qi@qt.io>
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/android/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/android/android.pro | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index c18719ec72..9a3b8cc1bb 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 42e241dcfa..8365be32cb 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 778e7881cd..8312fba85d 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 |