Merge branch 'kdreports-2.2'

Author: Allen Winter

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 ci:
     autoupdate_schedule: monthly
 
-exclude: ^(cmake/ECM/|cmake/KDAB/)
+exclude: ^(cmake/ECM/|cmake/KDAB/|docs/api/doxygen-awesome.css)
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.5.0
@@ -21,11 +21,11 @@ repos:
   - id: destroyed-symlinks
   - id: check-executables-have-shebangs
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v17.0.6
+  rev: v18.1.2
   hooks:
   - id: clang-format
 - repo: https://github.com/PyCQA/pylint
-  rev: v3.0.3
+  rev: v3.1.0
   hooks:
   - id: pylint
     exclude: ^(.cmake-format.py|conan/conanfile.py)
@@ -53,6 +53,6 @@ repos:
     language: ruby
     files: \.(md|mdown|markdown)$
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v2.1.0
+  rev: v3.0.1
   hooks:
   - id: reuse

.reuse/dep5

@@ -19,11 +19,16 @@ Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: MIT
 
 #misc config files
-Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .gitignore .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
+Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .gitignore .mdlrc .mdlrc.rb .pep8 .pylintrc docs/api/Doxyfile.cmake distro/*
 Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 License: BSD-3-Clause
 
 #3rdparty
 Files: cmake/ECM/modules/*
 Copyright: The KDE Project
 License: BSD-3-Clause
+
+# doxygen awesome
+Files: docs/api/doxygen-awesome.css
+Copyright: 2021 - 2023 jothepro
+License: MIT

CMakeLists.txt

@@ -113,7 +113,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 if(${PROJECT_NAME}_QT6)
-    set(Qt_VERSION_MAJOR 6)
+    set(QT_VERSION_MAJOR 6)
     set(QT_MIN_VERSION "6.0.0")
     find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets PrintSupport Xml)
     list(
@@ -126,7 +126,7 @@ if(${PROJECT_NAME}_QT6)
     )
     set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
 else()
-    set(Qt_VERSION_MAJOR 5)
+    set(QT_VERSION_MAJOR 5)
     set(QT_MIN_VERSION 5.9.0)
     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets PrintSupport Xml)
     list(
@@ -243,7 +243,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 
     # Generate .pri file for qmake users (except when using the VS generator)
     if(NOT CMAKE_CONFIGURATION_TYPES)
-        if(Qt_VERSION_MAJOR EQUAL 5 OR (Qt_VERSION_MAJOR EQUAL 6 AND Qt6Core_VERSION VERSION_GREATER "6.2"))
+        if(QT_VERSION_MAJOR EQUAL 5 OR (QT_VERSION_MAJOR EQUAL 6 AND Qt6Core_VERSION VERSION_GREATER "6.2"))
             include(ECMGeneratePriFile) #not available for Qt6.2 or lower
             set(PROJECT_VERSION_STRING ${${PROJECT_NAME}_VERSION})
             ecm_generate_pri_file(
@@ -274,10 +274,10 @@ endif()
 add_subdirectory(src)
 
 if(${PROJECT_NAME}_PYTHON_BINDINGS)
-    if(Qt_VERSION_MAJOR EQUAL 5 AND Qt5Core_VERSION VERSION_LESS 5.12)
+    if(QT_VERSION_MAJOR EQUAL 5 AND Qt5Core_VERSION VERSION_LESS 5.12)
         message(WARNING "** Disabling Python Bindings. Qt version is too old and unsupported.")
         set(${PROJECT_NAME}_PYTHON_BINDINGS OFF)
-    elseif(Qt_VERSION_MAJOR EQUAL 6 AND Qt6Core_VERSION VERSION_LESS 6.2)
+    elseif(QT_VERSION_MAJOR EQUAL 6 AND Qt6Core_VERSION VERSION_LESS 6.2)
         message(WARNING "** Disabling Python Bindings. shiboken6 is too old and unsupported")
         set(${PROJECT_NAME}_PYTHON_BINDINGS OFF)
     elseif(CMAKE_BUILD_TYPE MATCHES "^[Dd]eb" OR ${PROJECT_NAME}_STATIC)
@@ -290,12 +290,12 @@ endif()
 
 if(${PROJECT_NAME}_TESTS OR ${PROJECT_NAME}_EXAMPLES)
     if(NOT EMSCRIPTEN)
-        find_package(Qt${Qt_VERSION_MAJOR}Sql)
+        find_package(Qt${QT_VERSION_MAJOR}Sql)
     endif()
 endif()
 
 if(${PROJECT_NAME}_TESTS)
-    find_package(Qt${Qt_VERSION_MAJOR}Test REQUIRED)
+    find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED)
     add_subdirectory(unittests)
 endif()
 

appveyor.yml

@@ -118,8 +118,6 @@ Example usage (with ``PREFIX``):
 Since pre-1.0.0.
 #]=======================================================================]
 
-include(CMakeParseArguments)
-
 function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
     set(options)
     set(oneValueArgs ORIGINAL HEADER_EXTENSION OUTPUT_DIR PREFIX REQUIRED_HEADERS COMMON_HEADER RELATIVE)
@@ -178,7 +176,8 @@ function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
         endif()
 
         set(_actualheader "${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.${EGH_HEADER_EXTENSION}")
-        if (NOT EXISTS ${_actualheader})
+        get_source_file_property(_generated "${_actualheader}" GENERATED)
+        if (NOT _generated AND NOT EXISTS ${_actualheader})
             message(FATAL_ERROR "Could not find \"${_actualheader}\"")
         endif()
 

cmake/ECM/modules/ECMGenerateHeaders.cmake

@@ -142,7 +142,7 @@ function(ecm_setup_version _version)
         string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.0*([0-9]+).*" "\\1" _patch "${_version}")
     endif()
 
-    if(NOT ESV_SOVERSION)
+    if(NOT DEFINED ESV_SOVERSION) # use DEFINED, so "0" as valid SO version is not evaluated to FALSE
         set(ESV_SOVERSION ${_major})
     endif()
 

cmake/ECM/modules/ECMSetupVersion.cmake

@@ -12,6 +12,9 @@ that is, if the major Qt version has not yet been determined otherwise
 This module is typically included by other modules requiring knowledge
 about the major Qt version.
 
+If the ECM version passed to find_package was at least 5.240.0 Qt6 is picked by default.
+Otherwise Qt5 is picked.
+
 ``QT_MAJOR_VERSION`` is defined to either be "5" or "6".
 
 Since 5.82.0.
@@ -26,7 +29,11 @@ if (TARGET Qt5::Core)
 elseif (TARGET Qt6::Core)
     set(QT_MAJOR_VERSION 6)
 else()
-    option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
+    if (ECM_GLOBAL_FIND_VERSION VERSION_GREATER_EQUAL 5.240)
+        option(BUILD_WITH_QT6 "Build against Qt 6" ON)
+    else()
+        option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
+    endif()
 
     if (BUILD_WITH_QT6)
         set(QT_MAJOR_VERSION 6)

cmake/ECM/modules/QtVersionOption.cmake

@@ -5,30 +5,38 @@
 # KDChart_LIBRARIES   - Path to KDChart libraries.
 # KDChart_INCLUDE_DIR - Path to the KDChart include directory.
 #
-# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 include(FindPackageHandleStandardArgs)
 
-find_library(KDChart_LIBRARIES
-    NAMES KDChart kdchart kdchart2 kdchartd2 NAMES_PER_DIR
+find_library(
+    KDChart_LIBRARIES
+    NAMES KDChart
+          kdchart
+          kdchart2
+          kdchartd2
+          NAMES_PER_DIR
     HINTS ${KDChart_DIR} ENV KDChart_DIR
-    PATH_SUFFIXES lib)
+    PATH_SUFFIXES lib
+)
 
-find_path(KDChart_INCLUDE_DIR
+find_path(
+    KDChart_INCLUDE_DIR
     NAMES KDChartGlobal.h
     HINTS ${KDChart_DIR} ENV KDChart_DIR
-    PATH_SUFFIXES include include/KDChart)
+    PATH_SUFFIXES include include/KDChart
+)
 
 mark_as_advanced(KDChart_LIBRARIES KDChart_INCLUDE_DIR)
 
 find_package_handle_standard_args(KDChart DEFAULT_MSG KDChart_LIBRARIES KDChart_INCLUDE_DIR)
 
 if(KDChart_FOUND)
     add_library(KDChart UNKNOWN IMPORTED)
-    set_target_properties(KDChart PROPERTIES
-        IMPORTED_LOCATION ${KDChart_LIBRARIES}
-        INTERFACE_INCLUDE_DIRECTORIES ${KDChart_INCLUDE_DIR})
+    set_target_properties(
+        KDChart PROPERTIES IMPORTED_LOCATION ${KDChart_LIBRARIES} INTERFACE_INCLUDE_DIRECTORIES ${KDChart_INCLUDE_DIR}
+    )
 endif()