From f749fc734978f4060d4d77ae36f279d1f2c8aac5 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 13 Jun 2020 05:22:55 +0400 Subject: [PATCH] Use Q_OS_UNIX instead of Q_OS_LINUX since linux-specific code can be used also on *BSD/Haiku --- ui/platform/ui_platform_utility.h | 6 +++--- ui/style/style_core_font.cpp | 4 ++-- ui/widgets/labels.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h index 4398ed7..0e23059 100644 --- a/ui/platform/ui_platform_utility.h +++ b/ui/platform/ui_platform_utility.h @@ -37,8 +37,8 @@ void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false. #ifdef Q_OS_MAC #include "ui/platform/mac/ui_utility_mac.h" -#elif defined Q_OS_LINUX // Q_OS_MAC +#elif defined Q_OS_UNIX // Q_OS_MAC #include "ui/platform/linux/ui_utility_linux.h" -#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX #include "ui/platform/win/ui_utility_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_UNIX || Q_OS_WINRT || Q_OS_WIN diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp index 6da92d9..83310a4 100644 --- a/ui/style/style_core_font.cpp +++ b/ui/style/style_core_font.cpp @@ -25,9 +25,9 @@ void style_InitFontsResource() { Q_INIT_RESOURCE(win); #elif defined Q_OS_MAC // Q_OS_WIN Q_INIT_RESOURCE(mac); -#elif defined Q_OS_LINUX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN || Q_OS_MAC +#elif defined Q_OS_UNIX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN || Q_OS_MAC Q_INIT_RESOURCE(linux); -#endif // Q_OS_WIN || Q_OS_MAC || (Q_OS_LINUX && !DESKTOP_APP_USE_PACKAGED) +#endif // Q_OS_WIN || Q_OS_MAC || (Q_OS_UNIX && !DESKTOP_APP_USE_PACKAGED) } namespace style { diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp index 2e01081..a5c58fd 100644 --- a/ui/widgets/labels.cpp +++ b/ui/widgets/labels.cpp @@ -454,13 +454,13 @@ Text::StateResult FlatLabel::dragActionFinish(const QPoint &p, Qt::MouseButton b } } -#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 +#if defined Q_OS_UNIX && !defined Q_OS_MAC if (!_selection.empty()) { TextUtilities::SetClipboardText( _text.toTextForMimeData(_selection), QClipboard::Selection); } -#endif // Q_OS_LINUX32 || Q_OS_LINUX64 +#endif // Q_OS_UNIX && !Q_OS_MAC return state; }