0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. qdrawhelper.cpp: Fix build on MIPS without DSP support
  2. The qt_memfill32_asm_mips_dsp function is only declared if
  3. QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it
  4. unless the same macro is defined.
  5. Backporting an upstream patch to fix this issue.
  6. Upstream commit:
  7. https://qt.gitorious.org/qt/qtbase/commit/2ca323ccd4f25f409eff8fc0c9804099b78c2bde
  8. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  9. From 2ca323ccd4f25f409eff8fc0c9804099b78c2bde Mon Sep 17 00:00:00 2001
  10. From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
  11. Date: Tue, 11 Nov 2014 13:11:54 +0100
  12. Subject: [PATCH] Android: Compile for MIPS
  13. The qt_memfill32_asm_mips_dsp function is only declared if
  14. QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it
  15. unless the same macro is defined.
  16. Change-Id: Ib959b4b969b699ca78804394206266469b4ebf64
  17. Task-number: QTBUG-36017
  18. Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
  19. Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  20. ---
  21. src/gui/painting/qdrawhelper.cpp | 2 +-
  22. 1 files changed, 1 insertions(+), 1 deletions(-)
  23. diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
  24. index f2d27a0..6482cc5 100644
  25. --- a/src/gui/painting/qdrawhelper.cpp
  26. +++ b/src/gui/painting/qdrawhelper.cpp
  27. @@ -6829,7 +6829,7 @@ void qInitDrawhelperAsm()
  28. qt_fetch_radial_gradient = qt_fetch_radial_gradient_neon;
  29. #endif
  30. -#ifdef Q_PROCESSOR_MIPS_32
  31. +#if defined(Q_PROCESSOR_MIPS_32) && defined(QT_COMPILER_SUPPORTS_MIPS_DSP)
  32. qt_memfill32 = qt_memfill32_asm_mips_dsp;
  33. #endif // Q_PROCESSOR_MIPS_32
  34. --
  35. 1.7.1