qt5.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt 2017-12-08 04:01:51.000000000 +0300
  3. +++ b/CMakeLists.txt 2017-12-19 10:32:32.933843067 +0300
  4. @@ -22,7 +22,7 @@
  5. set(KMIME_LIB_VERSION ${PIM_VERSION})
  6. -set(QT_REQUIRED_VERSION "5.8.0")
  7. +set(QT_REQUIRED_VERSION "5.7.1")
  8. find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
  9. ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
  10. diff -Nuar a/src/kmime_header_parsing.cpp b/src/kmime_header_parsing.cpp
  11. --- a/src/kmime_header_parsing.cpp 2017-12-02 10:23:33.000000000 +0300
  12. +++ b/src/kmime_header_parsing.cpp 2017-12-19 10:34:03.406836539 +0300
  13. @@ -452,7 +452,9 @@
  14. scursor = oldscursor;
  15. }
  16. // fall through
  17. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  18. Q_FALLTHROUGH();
  19. +#endif
  20. }
  21. default:
  22. KMIME_WARN_IF_8BIT(ch);
  23. @@ -636,7 +638,9 @@
  24. // parse as atom:
  25. scursor = oldscursor;
  26. }
  27. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  28. Q_FALLTHROUGH();
  29. +#endif
  30. // fall though...
  31. default: //atom
  32. diff -Nuar a/src/kmime_util.cpp b/src/kmime_util.cpp
  33. --- a/src/kmime_util.cpp 2017-12-02 10:23:33.000000000 +0300
  34. +++ b/src/kmime_util.cpp 2017-12-19 10:35:44.306829259 +0300
  35. @@ -98,10 +98,14 @@
  36. switch (cf.type()) {
  37. case CharFreq::SevenBitText:
  38. allowed << Headers::CE7Bit;
  39. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  40. Q_FALLTHROUGH();
  41. +#endif
  42. case CharFreq::EightBitText:
  43. allowed << Headers::CE8Bit;
  44. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  45. Q_FALLTHROUGH();
  46. +#endif
  47. case CharFreq::SevenBitData:
  48. if (cf.printableRatio() > 5.0 / 6.0) {
  49. // let n the length of data and p the number of printable chars.