kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Fix Q_OS_LINUX -> Q_OS_UNIX replacement

Browse source
This commit is contained in:
Eric Kotato 2020-06-26 07:29:49 +03:00
parent 0943d58ea7
commit 2098b2c67d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/core/update_checker.cpp
View file

@ -501,13 +501,13 @@ bool ParseCommonMap(
return false; return false;
} }
const auto platforms = document.object(); const auto platforms = document.object();
#if defined Q_OS_LINUX && defined KTGDESKTOP_APPIMAGE_BUILD #if defined Q_OS_UNIX && !defined Q_OS_MAC && defined KTGDESKTOP_APPIMAGE_BUILD
const auto platform = Platform::InAppImage() const auto platform = Platform::InAppImage()
? "appimage" ? "appimage"
: Platform::AutoUpdateKey(); : Platform::AutoUpdateKey();
#else // Q_OS_LINUX && KTGDESKTOP_APPIMAGE_BUILD #else // Q_OS_UNIX && !Q_OS_MAC && KTGDESKTOP_APPIMAGE_BUILD
const auto platform = Platform::AutoUpdateKey(); const auto platform = Platform::AutoUpdateKey();
#endif // !Q_OS_LINUX || !KTGDESKTOP_APPIMAGE_BUILD #endif // !Q_OS_UNIX || Q_OS_MAC || !KTGDESKTOP_APPIMAGE_BUILD
const auto it = platforms.constFind(platform); const auto it = platforms.constFind(platform);
if (it == platforms.constEnd()) { if (it == platforms.constEnd()) {
LOG(("Update Error: MTP platform '%1' not found in response." LOG(("Update Error: MTP platform '%1' not found in response."

4
Telegram/SourceFiles/kotato/settings_menu.cpp
View file

@ -414,7 +414,7 @@ void SetupKotatoSystem(not_null<Ui::VerticalLayout*> container) {
::Kotato::JsonSettings::Write(); ::Kotato::JsonSettings::Write();
}, container->lifetime()); }, container->lifetime());
#ifdef Q_OS_LINUX #if defined Q_OS_UNIX && !defined Q_OS_MAC
AddButton( AddButton(
container, container,
tr::ktg_settings_use_telegram_panel_icon(), tr::ktg_settings_use_telegram_panel_icon(),
@ -429,7 +429,7 @@ void SetupKotatoSystem(not_null<Ui::VerticalLayout*> container) {
Notify::unreadCounterUpdated(); Notify::unreadCounterUpdated();
::Kotato::JsonSettings::Write(); ::Kotato::JsonSettings::Write();
}, container->lifetime()); }, container->lifetime());
#endif // Q_OS_LINUX #endif // Q_OS_UNIX && !Q_OS_MAC
const QMap<int, QString> trayIconOptions = { const QMap<int, QString> trayIconOptions = {
{ 0, TrayIconLabel(0) }, { 0, TrayIconLabel(0) },