Merge pull request #4257 from Rmys/master

kimap-17.12.0:ver.bump
2017-12-16 16:03:33 +03:00
parent 8472be2e47 d280ad70b8
commit eedf1db2dc
2 changed files with 16 additions and 0 deletions
@@ -0,0 +1,13 @@
+diff -Nuar a/src/loginjob.cpp b/src/loginjob.cpp
+--- a/src/loginjob.cpp	2017-12-04 13:20:25.000000000 +0300
+++ b/src/loginjob.cpp	2017-12-16 15:57:30.307129526 +0300
+@@ -425,7 +425,9 @@
+         case LoginJobPrivate::Authenticate:
+             sasl_dispose(&d->conn);   //SASL authentication done
+         // Fall through
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+             Q_FALLTHROUGH();
+#endif
+         case LoginJobPrivate::Login:
+             d->saveServerGreeting(response);
+             emitResult(); //got an OK, command done
@@ -28,6 +28,9 @@
            <Dependency>kunitconversion-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch>qt5.patch</Patch>
+        </Patches>
    </Source>

    <Package>