kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use Q_OS_UNIX instead of Q_OS_LINUX since linux-specific code can be used also on *BSD/Haiku

Browse source
This commit is contained in:
Ilya Fedin 2020-06-13 05:22:55 +04:00 • committed by John Preston
parent ab61721a13
commit f749fc7349
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/platform/ui_platform_utility.h
View file

@ -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

4
ui/style/style_core_font.cpp
View file

@ -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 {

4
ui/widgets/labels.cpp
View file

@ -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;
}