mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Bundle kcoreaddons

Browse Source
This commit is contained in:
Ilya Fedin
2022-09-28 20:01:59 +04:00
committed by John Preston
parent 16669402cf
commit 2a6e2fa353
10 changed files with 18 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/core/update_checker.cpp
View File

@@ -31,7 +31,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <KSandbox>
#include <ksandbox.h>
extern "C" {
#include <openssl/rsa.h>

12
Telegram/SourceFiles/core/utils.h
View File

@@ -22,12 +22,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <cmath>
#include <set>
#if __has_include(<KUrlMimeData>)
#include <KUrlMimeData>
#if __has_include(<kurlmimedata.h>)
#include <kurlmimedata.h>
#endif
#if __has_include(<KSandbox>)
#include <KSandbox>
#if __has_include(<ksandbox.h>)
#include <ksandbox.h>
#endif
#define qsl(s) QStringLiteral(s)
@@ -39,7 +39,7 @@ inline bool in_range(Value &&value, From &&from, Till &&till) {
return (value >= from) && (value < till);
}
#if __has_include(<KUrlMimeData>)
#if __has_include(<kurlmimedata.h>)
inline QList<QUrl> GetMimeUrls(const QMimeData *data) {
if (!data->hasUrls()) {
return {};
@@ -51,7 +51,7 @@ inline QList<QUrl> GetMimeUrls(const QMimeData *data) {
}
#endif
#if __has_include(<KSandbox>) && defined DeclareReadSetting
#if __has_include(<ksandbox.h>) && defined DeclareReadSetting
inline QString FlatpakID() {
static const auto Result = [] {
if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {