adapt to latest qtbase changes

wangwenx190 · Oct 31, 2023 · 33a6f0d · 33a6f0d
1 parent 14dfa52
commit 33a6f0d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/core/framelesshelper_win.cpp b/src/core/framelesshelper_win.cpp
@@ -245,7 +245,7 @@ void FramelessHelperWin::addWindow(const QObject *window)
 #if 0
     data->callbacks->setWindowFlags(data->callbacks->getWindowFlags() | Qt::FramelessWindowHint);
 #else
-#  if (QT_VERSION < QT_VERSION_CHECK(6, 5, 3))
+#  if ((QT_VERSION != QT_VERSION_CHECK(6, 5, 3)) && (QT_VERSION != QT_VERSION_CHECK(6, 6, 0)))
     // Qt maintains a frame margin internally, we need to update it accordingly
     // otherwise we'll get lots of warning messages when we change the window
     // geometry, it will also affect the final window geometry because QPA will

diff --git a/src/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp
@@ -420,7 +420,7 @@ void FramelessQuickHelperPrivate::doRepaintAllChildren()
         if (!window) {
             return;
         }
-#if (defined(Q_OS_WINDOWS) && (QT_VERSION < QT_VERSION_CHECK(6, 5, 3)))
+#if (defined(Q_OS_WINDOWS) && (QT_VERSION != QT_VERSION_CHECK(6, 5, 3)) && (QT_VERSION != QT_VERSION_CHECK(6, 6, 0)))
         // Sync the internal window frame margins with the latest DPI, otherwise
         // we will get wrong window sizes after the DPI change.
         std::ignore = Utils::updateInternalWindowFrameMargins(window, true);

diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp
@@ -161,7 +161,7 @@ static inline void forceWidgetRepaint(QWidget *widget)
     if (!widget) {
         return;
     }
-#if (defined(Q_OS_WINDOWS) && (QT_VERSION < QT_VERSION_CHECK(6, 5, 3)))
+#if (defined(Q_OS_WINDOWS) && (QT_VERSION != QT_VERSION_CHECK(6, 5, 3)) && (QT_VERSION != QT_VERSION_CHECK(6, 6, 0)))
     // There's some additional things to do for top level windows on Windows.
     if (widget->isWindow()) {
         // Don't crash if the QWindow instance has not been created yet.