From 27604c5152cd9b768c31cbb1947e0138cea2c484 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周三, 13 12月 2023 23:35:11 +0800 Subject: [PATCH] Remove qwkcoreglobal --- src/core/qwkglobal_p.h | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/core/qwkglobal_p.h b/src/core/qwkglobal_p.h index 1a1f626..f123b5e 100644 --- a/src/core/qwkglobal_p.h +++ b/src/core/qwkglobal_p.h @@ -3,7 +3,7 @@ #include <QtCore/QLoggingCategory> -#include <QWKCore/qwkcoreglobal.h> +#include <QWKCore/qwkglobal.h> QWK_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(qWindowKitLog) @@ -15,4 +15,19 @@ # define QWK_FATAL qCFatal(qWindowKitLog) #endif +#define MAKE_RGB_COLOR(r, g, b) ((quint32) (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF)) + +#define MAKE_RGBA_COLOR(r, g, b, a) \ + ((quint32) (((a) &0xFF) << 24) | (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF)) + +#if defined(Q_CC_MSVC) +# define QWK_NOINLINE __declspec(noinline) +# define QWK_INLINE __forceinline +# define QWK_USED +#else +# define QWK_NOINLINE __attribute__((noinline)) +# define QWK_INLINE __attribute__((always_inline)) +# define QWK_USED __attribute__((used)) +#endif + #endif // QWKGLOBAL_P_H -- Gitblit v1.9.1