Merge branch '2.1'

.github/actions/qt6-asan/Dockerfile_qtasan

@@ -27,7 +27,7 @@
 # docker import mycontainer.tar
 # docker images # to check sha
 # docker tag <image_sha> iamsergio/kddw-qt6-asan
-# docker push
+# docker push iamsergio/kddw-qt6-asan
 
 FROM ubuntu:24.04
 MAINTAINER Sergio Martins ([email protected])

CMakeLists.txt

@@ -256,14 +256,15 @@ if(KDDockWidgets_WAYLAND_TESTS)
     endif()
 endif()
 
-set(KDDockWidgets_LIBRARY_QTID "")
+set(${PROJECT_NAME}_LIBRARY_QTID "")
 
 if(KDDW_FRONTEND_QT)
     include(KDQtInstallPaths) # to set QT_INSTALL_FOO variables
     if(KDDockWidgets_QT6)
-        set(KDDockWidgets_LIBRARY_QTID "-qt6")
+        set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
     endif()
 endif()
+set(KDDockWidgets_LIBRARY_QTID "${${PROJECT_NAME}_LIBRARY_QTID}")
 
 add_definitions(-DQT_NO_KEYWORDS)
 

python/fixup.py → cmake/KDAB/modules/KDFixupShiboken2.py

@@ -1,21 +1,8 @@
-# This file is part of KDDockWidgets.
 #
 # SPDX-FileCopyrightText: 2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+# Author: Renato Araujo Oliveira Filho <[email protected]>
 #
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
-#
-# Contact KDAB at <[email protected]> for commercial licensing options.
-#
-
-#
-# This file is part of KDDockWidgets.
-#
-# SPDX-FileCopyrightText: 2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
-# Author: Renato Araujo <[email protected]>
-#
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
-#
-# Contact KDAB at <[email protected]> for commercial licensing options.
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 """

cmake/KDAB/modules/KDInstallLocation.cmake

@@ -1,5 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -30,7 +30,7 @@ if(NOT INSTALL_DATADIR)
     set(INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR})
 endif()
 if(NOT INSTALL_DOC_DIR)
-    set(INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR}${KDDockWidgets_LIBRARY_QTID})
+    set(INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR}${${PROJECT_NAME}_LIBRARY_QTID})
 endif()
 
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

cmake/KDAB/modules/KDPySide2ModuleBuild.cmake

@@ -1,10 +1,13 @@
 #
-# SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+# SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 # Author: Renato Araujo Oliveira Filho <[email protected]>
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# Save path to this cmake file (so it can be used later in the macros)
+set(THIS_CMAKE_LIST_DIR ${CMAKE_CURRENT_LIST_DIR})
+
 if(NOT ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX)
     # cmake-lint: disable=C0103
     set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX
@@ -15,6 +18,7 @@ endif()
 
 message(STATUS "PYTHON INSTALL PREFIX ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}")
 
+
 if(WIN32)
     set(PATH_SEP "\;")
 else()
@@ -129,7 +133,7 @@ macro(
             $<TARGET_PROPERTY:Shiboken2::shiboken,LOCATION> ${GENERATOR_EXTRA_FLAGS} ${globalInclude}
             --include-paths=${shiboken_include_dirs} --typesystem-paths=${shiboken_typesystem_dirs}
             ${shiboken_framework_include_dirs_option} --output-directory=${CMAKE_CURRENT_BINARY_DIR} ${typesystemXML}
-        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/python/fixup.py ${outputSource}
+        COMMAND ${Python3_EXECUTABLE} ${THIS_CMAKE_LIST_DIR}/KDFixupShiboken2.py ${outputSource}
         DEPENDS ${typesystemXML} ${dependsArg}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Running generator for ${libraryName} binding..."

docs/developer/branching.md

@@ -17,9 +17,9 @@ If the current stable branch is X.Y then the new branch will be called X.Y+1.
 For example, if the current stable branch is 2.1 then the new stable branch will be 2.2, like so:
 
 ```shell
-% git checkout main
-% git branch 2.2
-% git checkout 2.2
+git checkout main
+git branch 2.2
+git checkout 2.2
 ```
 
 ## New major version
@@ -30,9 +30,9 @@ If the current stable branch is X.Y then the new branch will be called X+1.0.
 For example, if the current stable branch is 2.1 then the new stable branch will be 3.0, like so:
 
 ```shell
-% git checkout main
-% git branch 3.0
-% git checkout 3.0
+git checkout main
+git branch 3.0
+git checkout 3.0
 ```
 
 ## After branching
@@ -43,16 +43,16 @@ Once the new branch is created we need to modify a few things.
 
 For a new major version:
 
-1. In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_MINOR` to 95
-2. In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_PATCH` to 95
-3. In the top-level `CMakeLists.txt set` `KDDockWidgets_SOVERSION` to the new X.0
-4. In the `Changelog` add a empty section a the top for the new "vX.0 (unreleased)"
+* In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_MINOR` to 95
+* In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_PATCH` to 95
+* In the top-level `CMakeLists.txt set` `KDDockWidgets_SOVERSION` to the new X.0
+* In the `Changelog` add a empty section a the top for the new "vX.0 (unreleased)"
 
 For a new minor version:
 
-1. In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_PATCH` to 95
-2. In the top-level `CMakeLists.txt` set `KDDockWidgets_SOVERSION` to the new X.Y
-3. In the `Changelog` add a empty section a the top for the new "vX.Y (unreleased)"
+* In the top-level `CMakeLists.txt` set `KDDockWidgets_VERSION_PATCH` to 95
+* In the top-level `CMakeLists.txt` set `KDDockWidgets_SOVERSION` to the new X.Y
+* In the `Changelog` add a empty section a the top for the new "vX.Y (unreleased)"
 
 For any new branch, make sure to add entries for new branch name into the
 `.github/workflows/build.yml` file,  inside the 'push' and 'pull_request" branch lists.
@@ -61,6 +61,6 @@ Make all the above changes and then git commit and push the new branch.
 
 ### And finally
 
-1. Update the KDABCI to the new stable branch (contact the KDAB CI team)
-2. Update the Github Default Branch (see Default Branch setting at <https://github.com/KDAB/KDDockWidgets/settings>)
-3. Initiate CI builds (both github and KDAB) of the new branch and make sure all is green before continuing.
+* Update the KDABCI to the new stable branch (contact the KDAB CI team)
+* Update the Github Default Branch (see Default Branch setting at <https://github.com/KDAB/KDDockWidgets/settings>)
+* Initiate CI builds (both github and KDAB) of the new branch and make sure all is green before continuing.

docs/developer/prerelease-source.md

@@ -0,0 +1,40 @@
+# Pre-release source code review
+
+Before creating the tag for the new release check the following:
+
+* sync KDAB cmake files to upstream
+
+  compare the cmake/KDE files to their upstream versions in ssh://codereview.kdab.com:29418/kdab/extra-cmake-modules
+
+* sync KDE cmake files to upstream
+
+  compare the cmake/ECM files to their upstream versions in [email protected]:frameworks/extra-cmake-modules
+
+* ensures the Doxygen.cmake file is up-to-date for the doxygen version we use on KDABCI
+
+    ```shell
+    doxygen -u  docs/api/Doxyfile.cmake
+    ```
+
+* run a pre-commit check
+
+    ```shell
+    pre-commit run --all-files
+    ```
+
+* verify ${PROJECT_NAME}_VERSION and ${PROJECT_NAME}_SOVERSION values in the top-level CMakeLists.txt
+
+* Add the real release date to the Changelog section header "vX.Y.Z (unreleased)"
+
+* updates distro/.spec and distro/.dsc files
+* (TODO) script to do that^^
+
+* git commit any changes made above and make sure the CIs are green before continuing.
+
+Then create the new tag using the command:
+
+```shell
+git tag -m KDDockWidgets vX.Y.Z X.Y.Z"
+```
+
+**DO NOT PUSH THE TAG YET!**

valgrind.sup

@@ -189,3 +189,11 @@
    ...
    fun:g_malloc0
 }
+
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   ...
+   fun:_ZN18QThreadPoolPrivate11startThreadEP9QRunnable
+}