Skip to content

Fix ARM builds using Qt with desktop and es2 OpenGL support

Alvin Wong requested to merge alvinwong/krita:alvin/fix-arm-desktop-opengl into master

Qt sets QT_OPENGL_ES_2 only if configured with OpenGL ES, so we can use it to substitute our HAS_ONLY_OPENGL_ES define.

Windows builds sets QT_OPENGL_ES_2_ANGLE and QT_OPENGL_DYNAMIC instead, so it should be safe.

CCBUG: 421136 https://bugs.kde.org/show_bug.cgi?id=421136

We still need to explicitly set QT_OPENGL_ES_3 on Android due to https://bugreports.qt.io/browse/QTBUG-64703.

Note: I have not actually tried building this at all, and I don't have an Aarch64 Linux environment to test.

Test Plan

Build on Debian arm64?

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.
Edited by Alvin Wong

Merge request reports