From: Camila <hello@camila.codes>
Date: Tue, 27 Dec 2022 16:27:09 +0000 (+0100)
Subject: Remove obsolete QDesktopServices::storageLocation.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~23^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e68b4595e796b5ab80dd8ba6d242df3ce93dbbeb;p=nextcloud-desktop.git

Remove obsolete QDesktopServices::storageLocation.

Use QStandardPaths::writableLocation instead.

Signed-off-by: Camila <hello@camila.codes>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 3a262a305..cdf636013 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -247,9 +247,7 @@ Application::Application(int &argc, char **argv)
 #endif
         QT_WARNING_PUSH
         QT_WARNING_DISABLE_DEPRECATED
-        // We need to use the deprecated QDesktopServices::storageLocation because of its Qt4
-        // behavior of adding "data" to the path
-        QString oldDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+        QString oldDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
         if (oldDir.endsWith('/')) oldDir.chop(1); // macOS 10.11.x does not like trailing slash for rename/move.
         QT_WARNING_POP
         setApplicationName(_theme->appName());