From 1bf0d59efa62eef1dcaafd89cc383a062d1d5153 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Sat, 7 Nov 2020 00:29:36 +0800 Subject: [PATCH] Fix Qt5 and Qt6 build. Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- examples/Win32Demo/widget.cpp | 4 ++++ winnativeeventfilter.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/Win32Demo/widget.cpp b/examples/Win32Demo/widget.cpp index 70ed471..80936be 100644 --- a/examples/Win32Demo/widget.cpp +++ b/examples/Win32Demo/widget.cpp @@ -253,7 +253,11 @@ void Widget::setupUi() QFont font1; font1.setPointSize(15); font1.setBold(true); +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + font1.setWeight(QFont::Bold); +#else font1.setWeight(75); +#endif customizeTitleBarCB->setFont(font1); verticalLayout->addWidget(customizeTitleBarCB); preserveWindowFrameCB = new QCheckBox(controlPanelWidget); diff --git a/winnativeeventfilter.cpp b/winnativeeventfilter.cpp index e194cfd..c496af5 100644 --- a/winnativeeventfilter.cpp +++ b/winnativeeventfilter.cpp @@ -1833,7 +1833,11 @@ bool WinNativeEventFilter::nativeEventFilter(const QByteArray &eventType, #ifdef QT_WIDGETS_LIB const auto widget = qobject_cast(object); if (widget) { +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) const QPointF pos = widget->mapToGlobal(QPointF{0, 0}); +#else + const QPoint pos = widget->mapToGlobal(QPoint{0, 0}); +#endif if (QRectF(pos.x() * dpr, pos.y() * dpr, widget->width() * dpr,