mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the Qt6 patch

Browse Source
This commit is contained in:
István Váradi 2025-10-21 19:21:09 +02:00
parent 6f5bfc8ebd
commit ea6f954a6f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/0008-qt6.patch vendored
View File

@ -492,7 +492,7 @@ index 3dc10ad198..637b58acf5 100644
});
_virtualFilesCheckBox->setChecked(bestAvailableVfsMode() == Vfs::WindowsCfApi);
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index c0e833d023..b739e88214 100644
index de5ed4d049..bb8ffb4585 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -44,6 +44,7 @@
@ -575,7 +575,7 @@ index cc0397f295..c4753ab48d 100644
msg += tr("Fingerprint (SHA1): <tt>%1</tt>").arg(sha1sum) + QL("<br/>");
}
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 9f365b6096..2c761678fd 100644
index 2260ed8e6e..e36123fd8a 100644
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -14,7 +14,7 @@ import com.nextcloud.desktopclient
@ -591,7 +591,7 @@ diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMe
similarity index 99%
rename from src/gui/tray/TrayFoldersMenuButton.qml
rename to src/gui/tray/TrayFoldersMenuButton.qml.in
index 10421db5f4..9c09a569af 100644
index 4ae4d28a58..2193c27219 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml.in
@@ -2,7 +2,7 @@
@ -733,7 +733,7 @@ index 9ce1b567fa..ef19a95180 100644
return decryptedAndUnGzipped;
}
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 1832fc904d..c6e3c1088f 100644
index 08677e49b6..4a4760b0ff 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -23,6 +23,7 @@
@ -952,7 +952,7 @@ index 0000000000..ba7eb44067
+
+QByteArray unGzipData(const QByteArray& inputData);
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index b5b7a0968a..c32e580513 100644
index 572bd3d3c9..3b177d9762 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -10,6 +10,7 @@
@ -963,7 +963,7 @@ index b5b7a0968a..c32e580513 100644
#include "creds/abstractcredentials.h"
#include "creds/httpcredentials.h"
@@ -811,7 +812,7 @@ bool PropfindJob::finished()
@@ -813,7 +814,7 @@ bool PropfindJob::finished()
// Parse DAV response
auto domDocument = QDomDocument();
@ -1080,16 +1080,14 @@ index 81342a629e..c0507f205c 100644
bool Theme::displayLegacyImportDialog() const
diff --git a/test/syncenginetestutils.cpp b/test/syncenginetestutils.cpp
index f6cac33740..8520969d29 100644
index f319561550..93aacb2545 100644
--- a/test/syncenginetestutils.cpp
+++ b/test/syncenginetestutils.cpp
@@ -417,8 +417,8 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
xml.writeTextElement(davUri, QStringLiteral("getlastmodified"), stringDate);
@@ -418,7 +418,7 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
xml.writeTextElement(davUri, QStringLiteral("getcontentlength"), QString::number(fileInfo.size));
xml.writeTextElement(davUri, QStringLiteral("getetag"), QStringLiteral("\"%1\"").arg(QString::fromLatin1(fileInfo.etag)));
- xml.writeTextElement(ocUri, QStringLiteral("quota-available-bytes"), std::to_string(fileInfo.folderQuota.bytesAvailable));
xml.writeTextElement(ocUri, QStringLiteral("quota-available-bytes"), fileInfo.folderQuota.bytesAvailableString());
- xml.writeTextElement(ocUri, QStringLiteral("quota-used-bytes"), std::to_string(fileInfo.folderQuota.bytesUsed));
+ xml.writeTextElement(ocUri, QStringLiteral("quota-available-bytes"), QString::number(fileInfo.folderQuota.bytesAvailable));
+ xml.writeTextElement(ocUri, QStringLiteral("quota-used-bytes"), QString::number(fileInfo.folderQuota.bytesUsed));
xml.writeTextElement(ocUri, QStringLiteral("permissions"), !fileInfo.permissions.isNull() ? QString(fileInfo.permissions.toString()) : fileInfo.isShared ? QStringLiteral("GSRDNVCKW") : QStringLiteral("GRDNVCKW"));
if (fileInfo.isShared) {