fixed #13132 - removed deprecated support for qmake

Author: firewave

.github/workflows/CI-unixish.yml

@@ -247,94 +247,6 @@ jobs:
         run: |
           ls lib/*.cpp | xargs -n 1 -P $(nproc) g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -DNONNEG
 
-  build_qmake:
-
-    strategy:
-      matrix:
-        # no longer build with qmake on MacOS as brew might lack pre-built Qt5 packages causing the step to run for hours
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false # Prefer quick result
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install missing software on ubuntu
-        if: contains(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get update
-          sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
-
-      # coreutils contains "nproc"
-      - name: Install missing software on macos
-        if: contains(matrix.os, 'macos')
-        run: |
-          brew install coreutils qt@5
-          # expose qmake
-          brew link qt@5 --force
-
-      - name: ccache
-        uses: hendrikmuhs/[email protected]
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
-
-      - name: Build GUI
-        run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd gui
-          qmake CONFIG+=debug  CONFIG+=ccache HAVE_QCHART=yes
-          make -j$(nproc)
-
-      # TODO: binaries are in a different location on macos
-      - name: Build and Run GUI tests
-        if: contains(matrix.os, 'ubuntu')
-        run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd gui/test/cppchecklibrarydata
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-cppchecklibrarydata
-          popd
-          pushd gui/test/filelist
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-filelist
-          popd
-          pushd gui/test/projectfile
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-projectfile
-          popd
-          pushd gui/test/resultstree
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          export QT_QPA_PLATFORM=offscreen
-          ./test-resultstree
-          popd
-          pushd gui/test/translationhandler
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          # TODO: requires X session because of QApplication dependency in translationhandler.cpp
-          #./test-translationhandler
-          popd
-          pushd gui/test/xmlreportv2
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-xmlreportv2
-
-      - name: Generate Qt help file
-        run: |
-          pushd gui/help
-          qhelpgenerator online-help.qhcp -o online-help.qhc
-
-      - name: Build triage
-        run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd tools/triage
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-
   build:
 
     strategy:

.github/workflows/CI-windows.yml

@@ -47,23 +47,15 @@ jobs:
           modules: 'qtcharts'
           cache: true
 
-      - name: Build GUI release (qmake)
+      - name: Build GUI release (Qt 5)
         if: startsWith(matrix.qt_ver, '5')
         run: |
-          cd gui || exit /b !errorlevel!
-          qmake HAVE_QCHART=yes || exit /b !errorlevel!
-          nmake release || exit /b !errorlevel!
-        env:
-          CL: /MP
-
-      - name: Deploy GUI
-        if: startsWith(matrix.qt_ver, '5')
-        run: |
-          windeployqt Build\gui || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
+          ; TODO: enable rules?
+          ; specify Release build so matchcompiler is used
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On  -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
+          cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
-      - name: Build GUI release (CMake)
+      - name: Build GUI release (Qt 6)
         if: startsWith(matrix.qt_ver, '6')
         run: |
           ; TODO: enable rules?
@@ -72,7 +64,6 @@ jobs:
           cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
       - name: Deploy GUI
-        if: startsWith(matrix.qt_ver, '6')
         run: |
           windeployqt build\bin\Release || exit /b !errorlevel!
           del build\bin\Release\cppcheck-gui.ilk || exit /b !errorlevel!

.github/workflows/iwyu.yml

@@ -70,9 +70,6 @@ jobs:
         run: |
           zypper install -y cmake clang pcre-devel
           zypper install -y include-what-you-use-tools
-          # fixes error during Qt installation
-          # /__w/cppcheck/Qt/6.7.0/gcc_64/bin/qmake: error while loading shared libraries: libgthread-2.0.so.0: cannot open shared object file: No such file or directory
-          zypper install -y libgthread-2_0-0
           ln -s iwyu_tool.py /usr/bin/iwyu_tool
 
       # Fails on OpenSUSE:

.gitignore

@@ -50,42 +50,13 @@ ipch/
 *.pbxuser
 build/
 
-# GUI build folders
-/gui/debug/
-/gui/release/
-/gui/temp/
-/triage/temp
-
 # Other (generated) GUI files
-/gui/*.qm
-/gui/cppcheck-gui
-/gui/cppcheck-gui.exe
-/gui/gui.sln
-/gui/gui.vcproj
 /gui/help/online-help.qch
 /gui/help/online-help.qhc
-/gui/Makefile
-/gui/Makefile.debug
-/gui/Makefile.release
-/gui/qrc_gui.cpp
-/gui/test/Makefile
-/gui/test/*/Makefile
-/gui/test/*/*/Makefile
-/gui/test/benchmark/simple/benchmark-simple
-/gui/test/cppchecklibrarydata/qrc_resources.cpp
-/gui/test/cppchecklibrarydata/test-cppchecklibrarydata
-/gui/test/filelist/test-filelist
-/gui/test/projectfile/test-projectfile
-/gui/test/translationhandler/test-translationhandler
-/gui/test/xmlreportv2/test-xmlreportv2
 
 # Doxygen output folder
 doxyoutput/
 
-# qmake generated
-htmlreport/.tox/
-htmlreport/MANIFEST
-
 # Backup files and stuff from patches
 *.rej
 *~
@@ -124,9 +95,6 @@ stage
 .cache/
 compile_commands.json
 
-# qmake
-.qmake.stash
-
 #vs code
 /.vscode
 

build-pcre.txt

@@ -2,19 +2,6 @@ PCRE is a library that is used by the optional "rules" feature for the command
 line version of cppcheck. It is readily available on Linux and Mac OS X, but
 must be obtained separately for Windows.
 
-If you're using qmake to generate makefiles, the following behavior applies:
-
-- If you're not on Windows, it assumes by default that you have PCRE and want
-  to enable rules support. You can disable rules support (removing the PCRE
-  dependency) by passing HAVE_RULES=no to qmake.
-
-- If you are on Windows, but have PCRE available, you can enable rules support
-  by passing HAVE_RULES=yes to qmake.
-
-  - Note: This includes using build.bat since it calls qmake - to use PCRE and
-    build.bat, you need to run set HAVE_RULES=yes before each run of build.bat
-
-
 Build instructions
 ------------------