Merge pull request #487 from KDAB/revert-486-main

Revert merging main into 2.1

.clang-tidy

@@ -20,10 +20,6 @@ Checks: '*, -google-*, -objc-*, -llvmlibc-*, -zircon-*,
 -readability-use-anyofallof,
 -readability-misleading-indentation,
 -readability-make-member-function-const,
--readability-inconsistent-declaration-parameter-name,
--readability-else-after-return,
--readability-avoid-unconditional-preprocessor-if,
--readability-simplify-boolean-expr,
 -modernize-use-trailing-return-type,
 -modernize-use-auto,
 -modernize-use-nodiscard,
@@ -38,14 +34,13 @@ Checks: '*, -google-*, -objc-*, -llvmlibc-*, -zircon-*,
 -llvm-include-order,
 -llvm-else-after-return,
 -fuchsia-*,
--bugprone-narrowing-conversions,
--bugprone-branch-clone,
+-readability-inconsistent-declaration-parameter-name,
+-readability-else-after-return,
 -misc-const-correctness,
 -misc-non-private-member-variables-in-classes,
 -misc-no-recursion,
 -misc-use-anonymous-namespace,
 -misc-include-cleaner,
--cppcoreguidelines-narrowing-conversions,
 -cppcoreguidelines-pro-type-const-cast,
 -cppcoreguidelines-macro-usage,
 -cppcoreguidelines-owning-memory,
@@ -62,5 +57,4 @@ Checks: '*, -google-*, -objc-*, -llvmlibc-*, -zircon-*,
 -cert-err58-cpp,
 -bugprone-suspicious-include,
 -bugprone-branch-clone
--bugprone-narrowing-conversions,
 '

.github/workflows/nightly.yml

@@ -39,8 +39,8 @@ jobs:
         include:
           - os: ubuntu-22.04
             preset:
-              name: ci-clang-tidy-qt6
-              qt_version: "6.5.*"
+              name: ci-clang-tidy-qt5
+              qt_version: "5.15"
 
           - os: ubuntu-22.04
             preset:

.reuse/dep5

@@ -19,7 +19,7 @@ Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 License: BSD-3-Clause
 
 #artwork
-Files: screencap.gif images/* src/img/* docs/api/*.png examples/dockwidgets/assets/*.png src/img/classic_indicators/*.png examples/flutter/assets/*.png src/flutter/dart/assets/classic_indicators/*.png tests/manual/stylesheet/close.png
+Files: screencap.gif images/* src/img/* docs/api/*.png examples/dockwidgets/assets/*.png src/img/classic_indicators/*.png examples/flutter/assets/*.png src/flutter/dart/assets/classic_indicators/*.png
 Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 License: GPL-2.0-only OR GPL-3.0-only
 

CMakeLists.txt

@@ -377,17 +377,7 @@ macro(set_compiler_flags targetName)
         endif()
 
         if(MSVC)
-            target_compile_options(${targetName} PRIVATE /W4 /WX)
-            target_link_options(${targetName} PRIVATE /WX)
-
-            if(KDDW_FRONTEND_QT AND NOT KDDockWidgets_QT6)
-                # Silence deprecation warnings in Qt5 headers
-                target_compile_definitions(${targetName} PUBLIC _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
-            endif()
-            if(ECM_ENABLE_SANITIZERS)
-                # Suppresses linker warnings about ASAN being incompatible with incremental linking
-                target_link_options(${targetName} PUBLIC /INCREMENTAL:NO)
-            endif()
+            target_compile_options(${targetName} PRIVATE /W4)
         endif()
 
         if(KDDW_FRONTEND_FLUTTER AND NOT MSVC)
@@ -413,9 +403,7 @@ macro(set_compiler_flags targetName)
 endmacro()
 
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE)
-   OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"
-       AND NOT APPLE
-       AND NOT MSVC)
+   OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE)
    OR (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)
 )
     # Linker warnings should be treated as errors

CMakePresets.json

@@ -459,15 +459,14 @@
             }
         },
         {
-            "name": "ci-clang-tidy-qt6",
-            "binaryDir": "${sourceDir}/build-clang-tidy-qt6",
+            "name": "ci-clang-tidy-qt5",
+            "binaryDir": "${sourceDir}/build-clang-tidy-qt5",
             "inherits": [
                 "release"
             ],
             "cacheVariables": {
                 "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--warnings-as-errors=*",
-                "KDDockWidgets_EXAMPLES": "OFF",
-                "KDDockWidgets_QT6": "ON"
+                "KDDockWidgets_EXAMPLES": "OFF"
             }
         },
         {

cmake/ECM/modules/ECMEnableSanitizers.cmake

@@ -129,10 +129,8 @@ macro (enable_sanitizer_flags sanitize_option)
         set(XSAN_COMPILE_FLAGS "-fsanitize=leak")
         set(XSAN_LINKER_FLAGS "lsan")
     elseif (${sanitize_option} MATCHES "undefined")
-        if (NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-            check_compiler_version("4.9" "3.1" "99.99")
-            set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-        endif()
+        check_compiler_version("4.9" "3.1" "99.99")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls")
     elseif (${sanitize_option} MATCHES "fuzzer")
         check_compiler_version("99.99" "6.0" "99.99")
         set(XSAN_COMPILE_FLAGS "-fsanitize=fuzzer")

docs/book/src/misc_impl_details.md

@@ -10,7 +10,7 @@ We have the following global event filters:
 - DockRegistry singleton
   Catches expose events to maintain floating window z-order.
   Catches clicking on a MDI dock widget, to raise it.
-  For hiding the auto-hide sidebar overlay when clicking elsewhere.
+  For hidding the auto-hide sidebar overlay when clicking elsewhere.
 
 - FallbackMouseGrabber
   For platforms that don't support grabbing the mouse. Mostly for QtQuick to workaround bugs.

examples/dockwidgets/MyViewFactory.cpp

@@ -53,7 +53,7 @@ class MyTitleBar : public KDDockWidgets::QtWidgets::TitleBar
     // Not needed to override. Just here to illustrate setHideDisabledButtons()
     void init() override
     {
-        // For demo purposes, we're hiding the close button if it's disabled (non-closable dock widget)
+        // For demo purposes, we're hidding the close button if it's disabled (non-closable dock widget)
         // Affects dock #0 when running: ./bin/qtwidgets_dockwidgets -n -p
         m_controller->setHideDisabledButtons(KDDockWidgets::TitleBarButtonType::Close);
 

src/Config.cpp

@@ -42,6 +42,7 @@ static ViewFactory *createDefaultViewFactory()
 
     KDDW_ERROR("No Platform found. Forgot to call KDDockWidgets::initFrontend(<platform>) ?");
     std::terminate();
+    return nullptr;
 }
 
 class Config::Private

src/core/DragController.cpp

@@ -738,8 +738,6 @@ bool DragController::onDnDEvent(View *view, Event *e)
                 if (activeState()->handleDrop(static_cast<DropEvent *>(e), dropArea))
                     return true;
                 break;
-            default:
-                break;
             }
         }
     } else if (e->type() == Event::DragEnter && isDragging()) {

src/core/MainWindow.cpp

@@ -367,8 +367,6 @@ static SideBarLocation sideBarLocationForBorder(Core::LayoutBorderLocations loc)
     case Core::LayoutBorderLocation_Horizontals:
     case Core::LayoutBorderLocation_None:
         break;
-    default:
-        break;
     }
 
     return SideBarLocation::None;

src/core/WindowZOrder_x11_p.h

@@ -90,6 +90,7 @@ static Core::Window::List orderedWindows(bool &ok)
 {
     KDDW_UNUSED(ok);
     Q_UNREACHABLE();
+    return {};
 }
 }
 

src/core/layouting/Item.cpp

@@ -2081,10 +2081,10 @@ void ItemBoxContainer::Private::resizeChildren(Size oldSize, Size newSize,
 
     const Vector<double> childPercentages = this->childPercentages();
     const auto count = childSizes.count();
-    const bool widthDidChange = oldSize.width() != newSize.width();
-    const bool heightDidChange = oldSize.height() != newSize.height();
-    const bool lengthDidChange =
-        (q->isVertical() && heightDidChange) || (q->isHorizontal() && widthDidChange);
+    const bool widthChanged = oldSize.width() != newSize.width();
+    const bool heightChanged = oldSize.height() != newSize.height();
+    const bool lengthChanged =
+        (q->isVertical() && heightChanged) || (q->isHorizontal() && widthChanged);
     const int totalNewLength = q->usableLength();
 
     if (strategy == ChildrenResizeStrategy::Percentage) {
@@ -2099,7 +2099,7 @@ void ItemBoxContainer::Private::resizeChildren(Size oldSize, Size newSize,
             SizingInfo &itemSize = childSizes[i];
 
             const double childPercentage = childPercentages.at(i);
-            const int newItemLength = lengthDidChange
+            const int newItemLength = lengthChanged
                 ? (isLast ? remaining : int(childPercentage * totalNewLength))
                 : itemSize.length(m_orientation);
 

src/qtcommon/Platform.cpp

@@ -347,7 +347,6 @@ bool Platform_qt::supportsAeroSnap() const
 #if defined(Q_OS_WIN)
     // Aero-snap requires Windows 10
     return QOperatingSystemVersion::current().majorVersion() >= 10;
-#else
-    return false;
 #endif
+    return false;
 }

tests/CMakeLists.txt

@@ -65,8 +65,6 @@ if(KDDW_FRONTEND_QTWIDGETS)
     _add_test(tst_qtwidgets)
     add_subdirectory(manual/qtwidgets_leaks)
     add_subdirectory(manual/qdockwidget)
-    add_subdirectory(manual/qmdiarea)
-    add_subdirectory(manual/stylesheet)
 endif()
 
 # tst_qtquick

tests/includes_test/CMakeLists.txt

@@ -20,4 +20,3 @@ endif()
 
 add_executable(includes_test main.cpp)
 target_link_libraries(includes_test PRIVATE KDAB::kddockwidgets)
-set_compiler_flags(includes_test)

tests/includes_test/main.cpp

@@ -11,7 +11,7 @@
 
 // Tests that the includes are installed
 
-#ifdef KDDW_FRONTEND_QTWIDGETS
+#if KDDW_FRONTEND_QTWIDGETS
 #include <kddockwidgets/qtwidgets/Platform.h>
 #include <kddockwidgets/qtwidgets/ViewFactory.h>
 #include <kddockwidgets/qtwidgets/views/ClassicIndicatorsWindow.h>
@@ -30,7 +30,7 @@
 #include <kddockwidgets/qtwidgets/views/View.h>
 #endif
 
-#ifdef KDDW_FRONTEND_QTQUICK
+#if KDDW_FRONTEND_QTQUICK
 #include <kddockwidgets/qtquick/Action.h>
 #include <kddockwidgets/qtquick/Platform.h>
 #include <kddockwidgets/qtquick/ViewFactory.h>