2
1

0004-qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. qimage_conversions.cpp: Fix build on big endian systems
  2. Backporting an upstream patch to fix a qt5base build failure on big
  3. endian systems. This is the error message:
  4. image/qimage_conversions.cpp:2257:9: error: expected '}' before numeric
  5. constant
  6. Upstream commit:
  7. https://qt.gitorious.org/qt/qtbase/commit/404f4281fda764cafdaa5635db995dabc4f1de8c
  8. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  9. From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001
  10. From: Dmitry Shachnev <mitya57@gmail.com>
  11. Date: Tue, 9 Dec 2014 09:27:53 +0300
  12. Subject: [PATCH] qimage_conversions.cpp: Fix build on big endian systems
  13. Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc
  14. Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
  15. Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
  16. ---
  17. src/gui/image/qimage_conversions.cpp | 4 ++--
  18. 1 files changed, 2 insertions(+), 2 deletions(-)
  19. diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
  20. index 17563b1..858a0d9 100644
  21. --- a/src/gui/image/qimage_conversions.cpp
  22. +++ b/src/gui/image/qimage_conversions.cpp
  23. @@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
  24. convert_ARGB_to_ARGB_PM,
  25. #else
  26. 0,
  27. - 0
  28. + 0,
  29. #endif
  30. 0, 0, 0, 0
  31. }, // Format_RGBA8888
  32. @@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
  33. #else
  34. 0,
  35. 0,
  36. - 0
  37. + 0,
  38. #endif
  39. 0, 0, 0, 0
  40. }, // Format_RGBA8888_Premultiplied
  41. --
  42. 1.7.1