From b1ddc5010d3d8ee7274c3436259eca52c32c53bb Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 3 Nov 2020 14:11:47 +0800 Subject: [PATCH] Fix build on old Qt versions. Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- examples/Win32Demo/widget.cpp | 40 ++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/examples/Win32Demo/widget.cpp b/examples/Win32Demo/widget.cpp index d29ea7a..70ed471 100644 --- a/examples/Win32Demo/widget.cpp +++ b/examples/Win32Demo/widget.cpp @@ -46,10 +46,6 @@ #define GET_X_LPARAM(lp) ((int) (short) LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int) (short) HIWORD(lp)) -#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -#define QLatin1String(str) QString::fromUtf8(str) -#endif - namespace { const Widget::Win10Version g_vAcrylicEffectVersion = Widget::Win10Version::Win10_1803; @@ -89,17 +85,45 @@ const QLatin1String g_sSystemButtonsStyleSheet(R"( background-color: #8c0a15; } )"); -const QLatin1String g_sTitleLabelStyleSheet(R"( +const +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + QString +#else + QLatin1String +#endif + g_sTitleLabelStyleSheet( +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + QString::fromLatin1( +#endif + R"( #titleLabel { color: rgb(%1, %2, %3); } -)"); -const QLatin1String g_sTitleBarStyleSheet(R"( +)" +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + ) +#endif + ); +const +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + QString +#else + QLatin1String +#endif + g_sTitleBarStyleSheet( +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + QString::fromLatin1( +#endif + R"( #titleBarWidget { background-color: rgba(%1, %2, %3, %4); border-top: 1px solid rgba(%5, %6, %7, %8); } -)"); +)" +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + ) +#endif + ); const QLatin1String g_sMinimizeButtonImageDark(":/images/button_minimize_black.svg"); const QLatin1String g_sMaximizeButtonImageDark(":/images/button_maximize_black.svg");