From cde5ebcf8d09882d7102235d0ccd474cd60e8df0 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 20 Oct 2020 12:38:15 +0800 Subject: [PATCH] Fix build on 5.12 Q_DISABLE_COPY_MOVE: since 5.13 QLatin1String arg: since 5.14 Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- examples/Win32Demo/widget.cpp | 4 ++++ examples/Win32Demo/widget.h | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/examples/Win32Demo/widget.cpp b/examples/Win32Demo/widget.cpp index 50fe086..8b21748 100644 --- a/examples/Win32Demo/widget.cpp +++ b/examples/Win32Demo/widget.cpp @@ -41,6 +41,10 @@ #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 char useNativeTitleBar[] = "WNEF_USE_NATIVE_TITLE_BAR"; diff --git a/examples/Win32Demo/widget.h b/examples/Win32Demo/widget.h index ebb187a..5256ecb 100644 --- a/examples/Win32Demo/widget.h +++ b/examples/Win32Demo/widget.h @@ -32,6 +32,16 @@ QT_FORWARD_DECLARE_CLASS(Widget) } QT_END_NAMESPACE +#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) +#define Q_DISABLE_MOVE(Class) \ + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; + +#define Q_DISABLE_COPY_MOVE(Class) \ + Q_DISABLE_COPY(Class) \ + Q_DISABLE_MOVE(Class) +#endif + class Widget : public QWidget { Q_OBJECT