diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml index 7719fdb24a3..a1c36fa9c72 100644 --- a/.github/workflows/CI-unixish-docker.yml +++ b/.github/workflows/CI-unixish-docker.yml @@ -56,7 +56,7 @@ jobs: - name: Install missing software (gui) on latest ubuntu if: contains(matrix.image, 'ubuntu') run: | - apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev + apt-get install -y qt6-base-dev qt6-tools-dev - name: Install missing software on Alpine if: contains(matrix.image, 'alpine') @@ -74,7 +74,7 @@ jobs: - name: Run CMake run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: CMake build if: matrix.full_build diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index b2031d5fab2..627ee3e9fb0 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -48,7 +48,7 @@ jobs: sudo apt-get install libxml2-utils libtinyxml2-dev # qt6-tools-dev-tools for lprodump # qt6-l10n-tools for lupdate - sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev + sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev # coreutils contains "nproc" - name: Install missing software on macos @@ -59,13 +59,13 @@ jobs: - name: CMake build on ubuntu (with GUI / system tinyxml2) if: contains(matrix.os, 'ubuntu') run: | - cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache cmake --build cmake.output.tinyxml2 -- -j$(nproc) - name: CMake build on macos (with GUI / system tinyxml2) if: contains(matrix.os, 'macos') run: | - cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 + cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 cmake --build cmake.output.tinyxml2 -- -j$(nproc) - name: Run CMake test (system tinyxml2) @@ -118,7 +118,7 @@ jobs: sudo apt-get install libxml2-utils # qt6-tools-dev-tools for lprodump # qt6-l10n-tools for lupdate - sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev + sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev # coreutils contains "nproc" - name: Install missing software on macos @@ -129,12 +129,12 @@ jobs: - name: Run CMake on ubuntu (with GUI) if: contains(matrix.os, 'ubuntu') run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install - name: Run CMake on macos (with GUI) if: contains(matrix.os, 'macos') run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 - name: Run CMake build run: | @@ -236,7 +236,7 @@ jobs: sudo apt-get install libxml2-utils # qt6-tools-dev-tools for lprodump # qt6-l10n-tools for lupdate - sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev + sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev # coreutils contains "nproc" - name: Install missing software on macos @@ -247,12 +247,12 @@ jobs: - name: Run CMake on ubuntu (with GUI) if: contains(matrix.os, 'ubuntu') run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: Run CMake on macos (with GUI) if: contains(matrix.os, 'macos') run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6 - name: Run CMake build run: | @@ -436,7 +436,7 @@ jobs: sudo apt-get install libxml2-utils # qt6-tools-dev-tools for lprodump # qt6-l10n-tools for lupdate - sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev + sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev - name: Install CMake run: | @@ -453,7 +453,7 @@ jobs: run: | export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH # FIXME: cannot use --warn-uninitialized here as it completely breaks the build - cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On + cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On build: @@ -738,7 +738,7 @@ jobs: sudo apt-get update # qt6-tools-dev-tools for lprodump # qt6-l10n-tools for lupdate - sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev + sudo apt-get install qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev sudo apt-get install libboost-container-dev - name: Self check (build) @@ -749,7 +749,7 @@ jobs: - name: CMake run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On - name: Generate dependencies run: | diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index a3dcf6f4825..5c7ecd814ac 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -44,14 +44,13 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt_ver }} - modules: 'qtcharts' setup-python: 'false' cache: true - name: Run CMake run: | rem TODO: enable rules? - cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DISABLE_DMAKE=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel! + cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DISABLE_DMAKE=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel! - name: Build GUI run: | @@ -126,7 +125,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: 6.10.0 - modules: 'qtcharts' setup-python: 'false' cache: true @@ -138,7 +136,7 @@ jobs: - name: Run CMake (with GUI) run: | :: TODO: enable DHAVE_RULES? - cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On + cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On build: strategy: diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 568a16ba06d..98e4867800d 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -50,7 +50,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - modules: 'qtcharts' setup-python: 'false' install-deps: false cache: true @@ -61,7 +60,7 @@ jobs: - name: Prepare CMake run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_COMPILE_WARNING_AS_ERROR=On + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_COMPILE_WARNING_AS_ERROR=On env: CC: clang-22 CXX: clang++-22 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 4c62971e4c4..162c5b1da90 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -20,7 +20,7 @@ jobs: - name: Install missing software on ubuntu run: | sudo apt-get update - sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev libboost-container-dev + sudo apt-get install qtbase5-dev qttools5-dev libboost-container-dev - name: Download Coverity build tool run: | wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=cppcheck" -O coverity_tool.tar.gz diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index e583eb81e46..9c3581af334 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -110,7 +110,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - modules: 'qtcharts' setup-python: ${{ contains(matrix.os, 'macos') }} install-deps: false cache: true @@ -126,7 +125,7 @@ jobs: - name: Prepare CMake run: | # TODO: re-enable HAVE_RULES - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }} + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }} env: CC: clang CXX: clang++ @@ -226,7 +225,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - modules: 'qtcharts' setup-python: 'false' install-deps: false cache: true @@ -234,7 +232,7 @@ jobs: - name: Prepare CMake run: | # TODO: re-enable HAVE_RULES - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }} + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }} env: CC: clang-22 CXX: clang++-22 diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 04d1ba2732a..63c570f0ea7 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -76,7 +76,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - modules: 'qtcharts' setup-python: 'false' tools: 'tools_opensslv3_x64' @@ -85,7 +84,7 @@ jobs: run: | :: TODO: enable rules? :: specify Release build so matchcompiler is used - cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On -DUSE_BOOST=ON -DBOOST_INCLUDEDIR=%GITHUB_WORKSPACE%\boost -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel! + cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=Off -DBUILD_GUI=On -DBUILD_ONLINE_HELP=On -DUSE_BOOST=ON -DBOOST_INCLUDEDIR=%GITHUB_WORKSPACE%\boost -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel! cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel! # TODO: package PDBs diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 5f11d80d847..c934aeb99f2 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -84,7 +84,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ env.QT_VERSION }} - modules: 'qtcharts' setup-python: 'false' cache: true @@ -98,7 +97,7 @@ jobs: - name: CMake run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify ${{ matrix.cmake_opts }} -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify ${{ matrix.cmake_opts }} -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache env: CC: clang-22 CXX: clang++-22 diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml index 26d83c2f406..51cfb1875ae 100644 --- a/.github/workflows/selfcheck.yml +++ b/.github/workflows/selfcheck.yml @@ -66,7 +66,7 @@ jobs: # unusedFunction - start - name: CMake run: | - cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off + cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off - name: Generate dependencies run: | @@ -81,7 +81,7 @@ jobs: - name: Self check (unusedFunction) if: false # TODO: fails with preprocessorErrorDirective - see #10667 run: | - ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr + ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr env: DISABLE_VALUEFLOW: 1 UNUSEDFUNCTION_ONLY: 1 @@ -92,7 +92,7 @@ jobs: # unusedFunction notest - start - name: CMake (no test) run: | - cmake -S . -B cmake.output.notest -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off + cmake -S . -B cmake.output.notest -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off - name: Generate dependencies (no test) run: | @@ -105,7 +105,7 @@ jobs: - name: Self check (unusedFunction / no test) run: | - ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr + ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr env: DISABLE_VALUEFLOW: 1 UNUSEDFUNCTION_ONLY: 1 @@ -150,7 +150,7 @@ jobs: # unusedFunction notest nocli - start - name: CMake (no test / no cli) run: | - cmake -S . -B cmake.output.notest_nocli -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off + cmake -S . -B cmake.output.notest_nocli -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off - name: Generate dependencies (no test / no cli) run: | @@ -164,7 +164,7 @@ jobs: - name: Self check (unusedFunction / no test / no cli) if: false # TODO: the findings are currently too intrusive run: | - ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr + ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr env: DISABLE_VALUEFLOW: 1 UNUSEDFUNCTION_ONLY: 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index f4e104cf96f..f09baf8607b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,12 @@ cmake_minimum_required(VERSION 3.22) project(Cppcheck VERSION 2.22.99 LANGUAGES CXX) +# CMake 4.5 added the opt-in CMD_STRICT diagnostics (e.g. non-target-directive). +# They are ignored by default, but -Werror=dev promotes them to errors. +if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.5) + cmake_diagnostic(SET CMD_STRICT IGNORE RECURSE) +endif() + include(cmake/options.cmake) include(cmake/cxx11.cmake) diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake index 4e8742d20d3..3387f2e3902 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -1,8 +1,5 @@ if(BUILD_GUI) list(APPEND qt_components Core Gui Widgets PrintSupport LinguistTools Help Network) - if(WITH_QCHART) - list(APPEND qt_components Charts) - endif() if(BUILD_TESTING) list(APPEND qt_components Test) endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index f03f422eeb6..b5f8b9f4326 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -80,7 +80,9 @@ if(NOT BUILD_CLI AND BUILD_TESTING) endif() option(BUILD_GUI "Build the qt application" OFF) -option(WITH_QCHART "Enable QtCharts usage in the GUI" OFF) +if(WITH_QCHART) + message(WARNING "WITH_QCHART is deprecated and has no effect - the QtCharts usage in the GUI has been removed") +endif() option(REGISTER_GUI_TESTS "Register GUI tests in CTest" ON) option(BUILD_ONLINE_HELP "Build online help" OFF) option(BUILD_TRIAGE "Build triage UI tool" OFF) diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake index 7869169708d..1fcdeece647 100644 --- a/cmake/printInfo.cmake +++ b/cmake/printInfo.cmake @@ -69,7 +69,6 @@ message(STATUS) message(STATUS "BUILD_GUI = ${BUILD_GUI}") if(BUILD_GUI) message(STATUS "REGISTER_GUI_TESTS = ${REGISTER_GUI_TESTS}") - message(STATUS "WITH_QCHART = ${WITH_QCHART}") message(STATUS "QT_VERSION = ${QT_VERSION}") message(STATUS "Qt6Core_LIBRARIES = ${Qt6Core_LIBRARIES}") message(STATUS "Qt6Core_INCLUDE_DIRS = ${Qt6Core_INCLUDE_DIRS}") diff --git a/cmake/qtCompat.cmake b/cmake/qtCompat.cmake index bc3e3851440..e737d29409f 100644 --- a/cmake/qtCompat.cmake +++ b/cmake/qtCompat.cmake @@ -6,5 +6,4 @@ set(QT_WIDGETS_LIB Qt::Widgets) set(QT_GUI_LIB Qt::Gui) set(QT_HELP_LIB Qt::Help) set(QT_PRINTSUPPORT_LIB Qt::PrintSupport) -set(QT_CHARTS_LIB Qt::Charts) set(QT_NETWORK_LIB Qt::Network) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 2acb07f03c0..c0013225451 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -39,9 +39,6 @@ CheckOptions: target_link_libraries(cppcheck-gui ${PCRE_LIBRARY}) endif() target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB} ${QT_NETWORK_LIB}) - if(WITH_QCHART) - target_link_libraries(cppcheck-gui ${QT_CHARTS_LIB}) - endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(QT_VERSION VERSION_LESS "6.4.0") # caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915 @@ -57,7 +54,6 @@ CheckOptions: endif() if(QT_VERSION VERSION_GREATER_EQUAL "6.9.2") # QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038 - # QtCharts/qxyseries.h fails to compile in 6.9.0 and 6.9.1 - see https://bugreports.qt.io/browse/QTBUG-135637 #target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR) endif() target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH) diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp index 830f5eb6b4e..8dbd5c0101c 100644 --- a/gui/checkstatistics.cpp +++ b/gui/checkstatistics.cpp @@ -21,8 +21,6 @@ #include "utils.h" #include -#include -#include #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #include #endif @@ -105,14 +103,3 @@ unsigned CheckStatistics::getCount(const QString &tool, ShowTypes::ShowType type } cppcheck::unreachable(); } - -QStringList CheckStatistics::getTools() const -{ - QSet ret; - std::copy(mStyle.keyBegin(), mStyle.keyEnd(), std::inserter(ret, ret.end())); - std::copy(mWarning.keyBegin(), mWarning.keyEnd(), std::inserter(ret, ret.end())); - std::copy(mPerformance.keyBegin(), mPerformance.keyEnd(), std::inserter(ret, ret.end())); - std::copy(mPortability.keyBegin(), mPortability.keyEnd(), std::inserter(ret, ret.end())); - std::copy(mError.keyBegin(), mError.keyEnd(), std::inserter(ret, ret.end())); - return ret.values(); -} diff --git a/gui/checkstatistics.h b/gui/checkstatistics.h index 5998c1f6b0c..0c66176564a 100644 --- a/gui/checkstatistics.h +++ b/gui/checkstatistics.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -76,9 +75,6 @@ class CheckStatistics : public QObject { return mActiveCheckers.size(); } - /** Get tools with results */ - QStringList getTools() const; - void setCheckersReport(QString report) { mCheckersReport = std::move(report); } diff --git a/gui/gui.pro b/gui/gui.pro index 37c70471b9a..bbb4240551f 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -228,9 +228,3 @@ contains(QMAKE_CXX, clang++) { QMAKE_CXXFLAGS += -std=c++17 -pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar } -contains(HAVE_QCHART, [yY][eE][sS]) { - QT += charts -} else { - message("Charts disabled - to enable it pass HAVE_QCHART=yes to qmake.") -} - diff --git a/gui/help/projectfiledialog.html b/gui/help/projectfiledialog.html index e357ebbc91d..7556d989b2b 100644 --- a/gui/help/projectfiledialog.html +++ b/gui/help/projectfiledialog.html @@ -268,7 +268,6 @@

Cppcheck build dir

  • Results history. The results of the last analysis are saved (lastResults.xml) and shown when you open the project. The Since date column shows when each warning was first seen.
  • -
  • Statistics of previous analyses.
  • Do not put the build dir in version control. Edit > Clear diff --git a/gui/help/reports.html b/gui/help/reports.html index 7f9b0ab6124..f9557230864 100644 --- a/gui/help/reports.html +++ b/gui/help/reports.html @@ -104,11 +104,6 @@

    Checkers

    Use it to see what was checked, for example to document the analysis for a safety certification.

    -

    History

    -

    A chart of the number of warnings over time, read from the build dir of the -project. Only available if the GUI was built with Qt Charts and the project -has a build dir.

    -

    Click Copy to Clipboard to copy the statistics as text and HTML, for example to paste them in an e-mail or a document. Click Pdf Export to save them as a PDF file.

    diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 5ddb790b77b..0446772e634 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1311,7 +1311,6 @@ void MainWindow::analysisDone() const QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath(); const QString buildDir = prjpath + '/' + mProjectFile->getBuildDir(); if (QDir(buildDir).exists()) { - mUI->mResults->saveStatistics(buildDir + "/statistics.txt"); mUI->mResults->updateFromOldReport(buildDir + "/lastResults.xml"); mUI->mResults->save(buildDir + "/lastResults.xml", Report::XMLV2, mCppcheckCfgProductName); } diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp index d11cae35bc6..dabfa5d4fae 100644 --- a/gui/resultsview.cpp +++ b/gui/resultsview.cpp @@ -44,8 +44,6 @@ #include #include #include -#include -#include #include #include #include @@ -190,23 +188,6 @@ void ResultsView::filterResults(const QString& filter) mUI->mTree->filterResults(filter); } -void ResultsView::saveStatistics(const QString &filename) const -{ - QFile f(filename); - if (!f.open(QIODevice::Text | QIODevice::Append)) - return; - QTextStream ts(&f); - ts << '[' << QDate::currentDate().toString("dd.MM.yyyy") << "]\n"; - ts << QDateTime::currentMSecsSinceEpoch() << '\n'; - for (const QString& tool : mStatistics->getTools()) { - ts << tool << "-error:" << mStatistics->getCount(tool, ShowTypes::ShowErrors) << '\n'; - ts << tool << "-warning:" << mStatistics->getCount(tool, ShowTypes::ShowWarnings) << '\n'; - ts << tool << "-style:" << mStatistics->getCount(tool, ShowTypes::ShowStyle) << '\n'; - ts << tool << "-performance:" << mStatistics->getCount(tool, ShowTypes::ShowPerformance) << '\n'; - ts << tool << "-portability:" << mStatistics->getCount(tool, ShowTypes::ShowPortability) << '\n'; - } -} - void ResultsView::updateFromOldReport(const QString &filename) const { mUI->mTree->updateFromOldReport(filename); diff --git a/gui/resultsview.h b/gui/resultsview.h index 9ef74666395..6958c3efd1a 100644 --- a/gui/resultsview.h +++ b/gui/resultsview.h @@ -78,13 +78,6 @@ class ResultsView : public QWidget { */ void clearRecheckFile(const QString &filename); - /** - * @brief Write statistics in file - * - * @param filename Filename to save statistics to - */ - void saveStatistics(const QString &filename) const; - /** * @brief Save results to a file * diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp index bf46abcb2d4..db9cb4c2ccb 100644 --- a/gui/statsdialog.cpp +++ b/gui/statsdialog.cpp @@ -22,8 +22,6 @@ #include "projectfile.h" #include "showtypes.h" -#include - #include "ui_statsdialog.h" #include @@ -44,29 +42,6 @@ #include #include -#ifdef QT_CHARTS_LIB -#include "common.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static QLineSeries *numberOfReports(const QString &fileName, const QString &severity); -static QChartView *createChart(const QString &statsFile, const QString &tool); -#endif - static const QString CPPCHECK("cppcheck"); StatsDialog::StatsDialog(QWidget *parent) @@ -98,32 +73,6 @@ void StatsDialog::setProject(const ProjectFile* projectFile) mUI->mIncludePaths->setText(projectFile->getIncludeDirs().join(";")); mUI->mDefines->setText(projectFile->getDefines().join(";")); mUI->mUndefines->setText(projectFile->getUndefines().join(";")); -#ifndef QT_CHARTS_LIB - mUI->mTabHistory->setVisible(false); -#else - QString statsFile; - if (!projectFile->getBuildDir().isEmpty()) { - const QString prjpath = QFileInfo(projectFile->getFilename()).absolutePath(); - const QString buildDir = prjpath + '/' + projectFile->getBuildDir(); - if (QDir(buildDir).exists()) { - statsFile = buildDir + "/statistics.txt"; - } - } - mUI->mLblHistoryFile->setText(tr("File: ") + (statsFile.isEmpty() ? tr("No cppcheck build dir") : statsFile)); - if (!statsFile.isEmpty()) { - QChartView *chartView = createChart(statsFile, "cppcheck"); - mUI->mTabHistory->layout()->addWidget(chartView); - // cppcheck-suppress knownConditionTrueFalse - TODO in getClangAnalyzer() - if (projectFile->getClangAnalyzer()) { - chartView = createChart(statsFile, CLANG_ANALYZER); - mUI->mTabHistory->layout()->addWidget(chartView); - } - if (projectFile->getClangTidy()) { - chartView = createChart(statsFile, CLANG_TIDY); - mUI->mTabHistory->layout()->addWidget(chartView); - } - } -#endif } else { mUI->mProject->setText(QString()); mUI->mPaths->setText(QString()); @@ -379,79 +328,3 @@ void StatsDialog::setStatistics(const CheckStatistics *stats) mUI->mLblActiveCheckers->setText(QString::number(stats->getNumberOfActiveCheckers())); mUI->mCheckersReport->setPlainText(stats->getCheckersReport()); } - -#ifdef QT_CHARTS_LIB -QChartView *createChart(const QString &statsFile, const QString &tool) -{ - auto *chart = new QChart; - chart->addSeries(numberOfReports(statsFile, tool + "-error")); - chart->addSeries(numberOfReports(statsFile, tool + "-warning")); - chart->addSeries(numberOfReports(statsFile, tool + "-style")); - chart->addSeries(numberOfReports(statsFile, tool + "-performance")); - chart->addSeries(numberOfReports(statsFile, tool + "-portability")); - - auto *axisX = new QDateTimeAxis; - axisX->setTitleText("Date"); - chart->addAxis(axisX, Qt::AlignBottom); - - for (QAbstractSeries *s : chart->series()) { - s->attachAxis(axisX); - } - - auto *axisY = new QValueAxis; - axisY->setLabelFormat("%i"); - axisY->setTitleText("Count"); - chart->addAxis(axisY, Qt::AlignLeft); - - qreal maxY = 0; - for (QAbstractSeries *s : chart->series()) { - s->attachAxis(axisY); - if (const auto *ls = dynamic_cast(s)) { - for (QPointF p : ls->points()) { - // cppcheck-suppress useStlAlgorithm - this would reduce the readability of the code - maxY = std::max(p.y(), maxY); - } - } - } - axisY->setMax(maxY); - - //chart->createDefaultAxes(); - chart->setTitle(tool); - - auto *chartView = new QChartView(chart); - chartView->setRenderHint(QPainter::Antialiasing); - return chartView; -} - -QLineSeries *numberOfReports(const QString &fileName, const QString &severity) -{ - auto *series = new QLineSeries(); - series->setName(severity); - QFile f(fileName); - if (f.open(QIODevice::ReadOnly | QIODevice::Text)) { - quint64 t = 0; - QTextStream in(&f); - while (!in.atEnd()) { - QString line = in.readLine(); - static const QRegularExpression rxdate("^\\[(\\d\\d)\\.(\\d\\d)\\.(\\d\\d\\d\\d)\\]$"); - const QRegularExpressionMatch matchRes = rxdate.match(line); - if (matchRes.hasMatch()) { - const int y = matchRes.captured(3).toInt(); - const int m = matchRes.captured(2).toInt(); - const int d = matchRes.captured(1).toInt(); - QDateTime dt; - dt.setDate(QDate(y,m,d)); - if (t == dt.toMSecsSinceEpoch()) - t += 1000; - else - t = dt.toMSecsSinceEpoch(); - } - if (line.startsWith(severity + ':')) { - const int y = line.mid(1+severity.length()).toInt(); - series->append(t, y); - } - } - } - return series; -} -#endif diff --git a/gui/statsdialog.ui b/gui/statsdialog.ui index a749c51e676..3ee1b1d032b 100644 --- a/gui/statsdialog.ui +++ b/gui/statsdialog.ui @@ -394,20 +394,6 @@ - - - History - - - - - - File: - - - - - diff --git a/releasenotes.txt b/releasenotes.txt index fa3a16f9a37..0212aab7a25 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -29,6 +29,9 @@ Infrastructure & dependencies: These describe the default setup for that OS. The arm64-wchar_t2.xml and arm64-wchar_t4.xml files are kept. - The rules feature (HAVE_RULES) now uses PCRE2 instead of the discontinued PCRE library. On Windows the Visual Studio project now expects pcre2-8.lib and pcre2.h in externals. +- The QtCharts dependency has been removed from the GUI, and with it the History tab in the statistics dialog. + The GUI no longer writes statistics.txt to the build dir. The WITH_QCHART CMake option is deprecated and has + no effect. Other: - diff --git a/selfcheck.sh b/selfcheck.sh index e9a39ec43cb..d47ade4ed8a 100755 --- a/selfcheck.sh +++ b/selfcheck.sh @@ -45,7 +45,6 @@ $mkdir_cmd b2 $cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \ --cppcheck-build-dir=b2 \ - -DQT_CHARTS_LIB \ -I$cmake_output/gui -Ifrontend -Igui \ gui/*.cpp $cmake_output/gui \ || ec=1 diff --git a/selfcheck_san.sh b/selfcheck_san.sh index 92e34ba6e4f..ba54e9f9597 100755 --- a/selfcheck_san.sh +++ b/selfcheck_san.sh @@ -37,7 +37,6 @@ $cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \ $cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \ --suppress=constVariablePointer:*/moc_*.cpp \ - -DQT_CHARTS_LIB \ -I$cmake_output/gui -Ifrontend -Igui \ gui/*.cpp $cmake_output/gui \ || ec=1 diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs index fe59fd6ea06..d5e94f4c70e 100644 --- a/win_installer/cppcheck.wxs +++ b/win_installer/cppcheck.wxs @@ -43,7 +43,6 @@ -