Rmys
54 lines
1.8 KiB
Diff
Executable File
54 lines
1.8 KiB
Diff
Executable File
diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2017-12-08 04:01:51.000000000 +0300
|
|
+++ b/CMakeLists.txt 2017-12-19 10:32:32.933843067 +0300
|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
|
set(kmime_LIB_VERSION ${PIM_VERSION})
|
|
-set(QT_REQUIRED_VERSION "6.10.1")
|
|
+set(QT_REQUIRED_VERSION "6.10.1")
|
|
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
|
|
|
|
ecm_setup_version(PROJECT VARIABLE_PREFIX kmime
|
|
diff -Nuar a/src/kmime_header_parsing.cpp b/src/kmime_header_parsing.cpp
|
|
--- a/src/kmime_header_parsing.cpp 2017-12-02 10:23:33.000000000 +0300
|
|
+++ b/src/kmime_header_parsing.cpp 2017-12-19 10:34:03.406836539 +0300
|
|
@@ -452,7 +452,9 @@
|
|
scursor = oldscursor;
|
|
}
|
|
// fall through
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
|
|
Q_FALLTHROUGH();
|
|
+#endif
|
|
}
|
|
default:
|
|
kmime_WARN_IF_8BIT(ch);
|
|
@@ -636,7 +638,9 @@
|
|
// parse as atom:
|
|
scursor = oldscursor;
|
|
}
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
|
|
Q_FALLTHROUGH();
|
|
+#endif
|
|
// fall though...
|
|
|
|
default: //atom
|
|
diff -Nuar a/src/kmime_util.cpp b/src/kmime_util.cpp
|
|
--- a/src/kmime_util.cpp 2017-12-02 10:23:33.000000000 +0300
|
|
+++ b/src/kmime_util.cpp 2017-12-19 10:35:44.306829259 +0300
|
|
@@ -98,10 +98,14 @@
|
|
switch (cf.type()) {
|
|
case CharFreq::SevenBitText:
|
|
allowed << Headers::CE7Bit;
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
|
|
Q_FALLTHROUGH();
|
|
+#endif
|
|
case CharFreq::EightBitText:
|
|
allowed << Headers::CE8Bit;
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
|
|
Q_FALLTHROUGH();
|
|
+#endif
|
|
case CharFreq::SevenBitData:
|
|
if (cf.printableRatio() > 5.0 / 6.0) {
|
|
// let n the length of data and p the number of printable chars.
|