Merge pull request #4266 from Rmys/master
applications-17.12.0:ver.bump
This commit is contained in:
@@ -0,0 +1,13 @@
|
|||||||
|
diff -Nuar a/src/incidencechanger_p.cpp b/src/incidencechanger_p.cpp
|
||||||
|
--- a/src/incidencechanger_p.cpp 2017-12-04 13:20:36.000000000 +0300
|
||||||
|
+++ b/src/incidencechanger_p.cpp 2017-12-16 22:01:34.956659792 +0300
|
||||||
|
@@ -189,7 +189,9 @@
|
||||||
|
<< "isValid = " << mDefaultCollection.isValid()
|
||||||
|
<< "has ACLs = " << hasRights(mDefaultCollection, ChangeTypeCreate);
|
||||||
|
// else fallthrough, and ask the user.
|
||||||
|
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
|
||||||
|
Q_FALLTHROUGH();
|
||||||
|
+#endif
|
||||||
|
case DestinationPolicyAsk: {
|
||||||
|
mPendingCreations << change;
|
||||||
|
loadCollections(); // Now we wait, collections are being loaded async
|
||||||
@@ -39,6 +39,9 @@
|
|||||||
<Dependency>akonadi-contacts-devel</Dependency>
|
<Dependency>akonadi-contacts-devel</Dependency>
|
||||||
<Dependency>prison-devel</Dependency>
|
<Dependency>prison-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch>qt5.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -94,9 +97,9 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="13">
|
<Update release="13">
|
||||||
<Date>2017-12-15</Date>
|
<Date>2017-12-16</Date>
|
||||||
<Version>17.12.0</Version>
|
<Version>17.12.0</Version>
|
||||||
<Comment>Version bump.</Comment>
|
<Comment>Version bump</Comment>
|
||||||
<Name>Mustafa Cinasal</Name>
|
<Name>Mustafa Cinasal</Name>
|
||||||
<Email>muscnsl@gmail.com</Email>
|
<Email>muscnsl@gmail.com</Email>
|
||||||
</Update>
|
</Update>
|
||||||
|
|||||||
Reference in New Issue
Block a user