qt5.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536
  1. diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt 2017-12-08 04:04:12.000000000 +0300
  3. +++ b/CMakeLists.txt 2017-12-16 23:59:08.782150823 +0300
  4. @@ -26,7 +26,7 @@
  5. include(ECMCoverageOption)
  6. set(libksieve-kf6_LIB_VERSION ${PIM_VERSION})
  7. -set(QT_REQUIRED_VERSION "6.6.3")
  8. +set(QT_REQUIRED_VERSION "6.6.3")
  9. set(kmime-kf6_LIB_VERSION "5.7.0")
  10. set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.0")
  11. set(kmailtransport-kf6_LIB_VERSION "5.7.0")
  12. diff -Nuar a/src/parser/lexer.cpp b/src/parser/lexer.cpp
  13. --- a/src/parser/lexer.cpp 2017-12-04 13:20:12.000000000 +0300
  14. +++ b/src/parser/lexer.cpp 2017-12-17 00:05:50.587121831 +0300
  15. @@ -294,7 +294,9 @@
  16. // and CRLF! That should be preserved somehow...
  17. return MultiLineString;
  18. }
  19. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  20. Q_FALLTHROUGH();
  21. +#endif
  22. default: // Identifier (first must not be 0-9, and can't (caught by Number above))
  23. if (!isIText(*mState.cursor)) {
  24. makeError(Error::IllegalCharacter);
  25. @@ -688,7 +690,9 @@
  26. if (atEnd()) {
  27. break;
  28. }
  29. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  30. Q_FALLTHROUGH();
  31. +#endif
  32. default:
  33. if (!is8Bit(*mState.cursor)) {
  34. result += QLatin1Char(*mState.cursor++);