829fd7a70f
- Add more fixes:
* 0001-Avoid-crashing-before-priting-debug-output-when-sett.patch
(kde#468985)
* 0001-Remove-dangling-reference.patch
* 0001-Allow-running-mysql_upgrade-when-starting-Akonadi.patch
(kde#402680)
- Add upstream changes:
* 0001-Fix-wrong-for-clause-in-Akonadi-Session.patch (kde#458315)
* 0002-Remove-dead-code-from-FavoriteCollectionsModel.patch
* 0003-Fix-a-bug-in-for-clause-in-EntityTreeModel.patch
* 0001-Fix-crash-on-server-shutdown.patch (kde#450217, kde#462692)
OBS-URL: https://build.opensuse.org/request/show/1083554
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=340
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From d46d05e67c729902e30691fc5f013504c8734ba4 Mon Sep 17 00:00:00 2001
|
|
From: Carl Schwan <carl@carlschwan.eu>
|
|
Date: Tue, 25 Apr 2023 19:40:09 +0200
|
|
Subject: [PATCH] Remove dangling reference
|
|
|
|
remoteCollection.contentMimeTypes() creates a temporary which is deleted
|
|
at the end of the expression. This was a compiler warning.
|
|
|
|
(cherry picked from commit d9476fd48863a46d4ef5deac4d8a0c7fbdb1c6c5)
|
|
---
|
|
src/core/collectionsync.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/core/collectionsync.cpp b/src/core/collectionsync.cpp
|
|
index 6195b501e..c8817676e 100644
|
|
--- a/src/core/collectionsync.cpp
|
|
+++ b/src/core/collectionsync.cpp
|
|
@@ -376,8 +376,8 @@ public:
|
|
return true;
|
|
} else {
|
|
for (int i = 0, total = remoteCollection.contentMimeTypes().size(); i < total; ++i) {
|
|
- const QString &m = remoteCollection.contentMimeTypes().at(i);
|
|
- if (!localCollection.contentMimeTypes().contains(m)) {
|
|
+ const QString mimetype = remoteCollection.contentMimeTypes().at(i);
|
|
+ if (!localCollection.contentMimeTypes().contains(mimetype)) {
|
|
return true;
|
|
}
|
|
}
|
|
--
|
|
2.40.0
|
|
|