Skip to content

Commit c4dbbbe

Browse files
committed
removed qmake and Qt5 support
1 parent 0ebbf8f commit c4dbbbe

51 files changed

Lines changed: 50 additions & 1193 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/CI-unixish-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: CMake build (with GUI)
102102
if: matrix.build_gui
103103
run: |
104-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
104+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
105105
cmake --build cmake.output -- -j$(nproc)
106106
107107
- name: Run CMake test

.github/workflows/CI-unixish.yml

Lines changed: 8 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
24-
include:
25-
- use_qt6: On
26-
- os: ubuntu-20.04
27-
use_qt6: Off
23+
os: [ubuntu-20.04, ubuntu-22.04, macos-12]
2824
fail-fast: false # Prefer quick result
2925

3026
runs-on: ${{ matrix.os }}
@@ -42,13 +38,7 @@ jobs:
4238
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4339

4440
- name: Install missing software on ubuntu
45-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
46-
run: |
47-
sudo apt-get update
48-
sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
49-
50-
- name: Install missing software on ubuntu
51-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
41+
if: contains(matrix.os, 'ubuntu')
5242
run: |
5343
sudo apt-get update
5444
sudo apt-get install libxml2-utils libtinyxml2-dev
@@ -66,13 +56,13 @@ jobs:
6656
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6757
if: contains(matrix.os, 'ubuntu')
6858
run: |
69-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
59+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7060
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7161
7262
- name: CMake build on macos (with GUI / system tinyxml2)
7363
if: contains(matrix.os, 'macos')
7464
run: |
75-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
65+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
7666
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7767
7868
- name: Run CMake test (system tinyxml2)
@@ -83,11 +73,7 @@ jobs:
8373

8474
strategy:
8575
matrix:
86-
os: [ubuntu-20.04, ubuntu-22.04, macos-13]
87-
include:
88-
- use_qt6: On
89-
- os: ubuntu-20.04
90-
use_qt6: Off
76+
os: [ubuntu-20.04, ubuntu-22.04, macos-12]
9177
fail-fast: false # Prefer quick result
9278

9379
runs-on: ${{ matrix.os }}
@@ -104,12 +90,6 @@ jobs:
10490
with:
10591
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
10692

107-
- name: Install missing software on ubuntu
108-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
109-
run: |
110-
sudo apt-get update
111-
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
112-
11393
# TODO: move latest compiler to separate step
11494
# TODO: bail out on warnings with latest GCC
11595
- name: Set up GCC
@@ -125,7 +105,7 @@ jobs:
125105
echo "CXX=g++-13" >> $GITHUB_ENV
126106
127107
- name: Install missing software on ubuntu
128-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
108+
if: contains(matrix.os, 'ubuntu')
129109
run: |
130110
sudo apt-get update
131111
sudo apt-get install libxml2-utils
@@ -143,13 +123,13 @@ jobs:
143123
- name: CMake build on ubuntu (with GUI)
144124
if: contains(matrix.os, 'ubuntu')
145125
run: |
146-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
126+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
147127
cmake --build cmake.output -- -j$(nproc)
148128
149129
- name: CMake build on macos (with GUI)
150130
if: contains(matrix.os, 'macos')
151131
run: |
152-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
132+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
153133
cmake --build cmake.output -- -j$(nproc)
154134
155135
- name: Run CMake test
@@ -247,94 +227,6 @@ jobs:
247227
run: |
248228
ls lib/*.cpp | xargs -n 1 -P $(nproc) g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -DNONNEG
249229
250-
build_qmake:
251-
252-
strategy:
253-
matrix:
254-
# no longer build with qmake on MacOS as brew might lack pre-built Qt5 packages causing the step to run for hours
255-
os: [ubuntu-20.04, ubuntu-22.04]
256-
fail-fast: false # Prefer quick result
257-
258-
runs-on: ${{ matrix.os }}
259-
260-
steps:
261-
- uses: actions/checkout@v4
262-
263-
- name: Install missing software on ubuntu
264-
if: contains(matrix.os, 'ubuntu')
265-
run: |
266-
sudo apt-get update
267-
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
268-
269-
# coreutils contains "nproc"
270-
- name: Install missing software on macos
271-
if: contains(matrix.os, 'macos')
272-
run: |
273-
brew install coreutils qt@5
274-
# expose qmake
275-
brew link qt@5 --force
276-
277-
- name: ccache
278-
uses: hendrikmuhs/ccache-action@v1.2
279-
with:
280-
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
281-
282-
- name: Build GUI
283-
run: |
284-
export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
285-
pushd gui
286-
qmake CONFIG+=debug CONFIG+=ccache HAVE_QCHART=yes
287-
make -j$(nproc)
288-
289-
# TODO: binaries are in a different location on macos
290-
- name: Build and Run GUI tests
291-
if: contains(matrix.os, 'ubuntu')
292-
run: |
293-
export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
294-
pushd gui/test/cppchecklibrarydata
295-
qmake CONFIG+=debug CONFIG+=ccache
296-
make -j$(nproc)
297-
./test-cppchecklibrarydata
298-
popd
299-
pushd gui/test/filelist
300-
qmake CONFIG+=debug CONFIG+=ccache
301-
make -j$(nproc)
302-
./test-filelist
303-
popd
304-
pushd gui/test/projectfile
305-
qmake CONFIG+=debug CONFIG+=ccache
306-
make -j$(nproc)
307-
./test-projectfile
308-
popd
309-
pushd gui/test/resultstree
310-
qmake CONFIG+=debug CONFIG+=ccache
311-
make -j$(nproc)
312-
export QT_QPA_PLATFORM=offscreen
313-
./test-resultstree
314-
popd
315-
pushd gui/test/translationhandler
316-
qmake CONFIG+=debug CONFIG+=ccache
317-
make -j$(nproc)
318-
# TODO: requires X session because of QApplication dependency in translationhandler.cpp
319-
#./test-translationhandler
320-
popd
321-
pushd gui/test/xmlreportv2
322-
qmake CONFIG+=debug CONFIG+=ccache
323-
make -j$(nproc)
324-
./test-xmlreportv2
325-
326-
- name: Generate Qt help file
327-
run: |
328-
pushd gui/help
329-
qhelpgenerator online-help.qhcp -o online-help.qhc
330-
331-
- name: Build triage
332-
run: |
333-
export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
334-
pushd tools/triage
335-
qmake CONFIG+=debug CONFIG+=ccache
336-
make -j$(nproc)
337-
338230
build:
339231

340232
strategy:

.github/workflows/CI-windows.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: [windows-2019, windows-2022]
30-
qt_ver: [5.15.2, 6.7.3]
30+
qt_ver: [6.7.2]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}
@@ -47,28 +47,12 @@ jobs:
4747
modules: 'qtcharts'
4848
cache: true
4949

50-
- name: Build GUI release (qmake)
51-
if: startsWith(matrix.qt_ver, '5')
52-
run: |
53-
cd gui || exit /b !errorlevel!
54-
qmake HAVE_QCHART=yes || exit /b !errorlevel!
55-
nmake release || exit /b !errorlevel!
56-
env:
57-
CL: /MP
58-
59-
- name: Deploy GUI
60-
if: startsWith(matrix.qt_ver, '5')
61-
run: |
62-
windeployqt Build\gui || exit /b !errorlevel!
63-
del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
64-
del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
65-
6650
- name: Build GUI release (CMake)
6751
if: startsWith(matrix.qt_ver, '6')
6852
run: |
6953
; TODO: enable rules?
7054
; specify Release build so matchcompiler is used
71-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
55+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
7256
cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
7357
7458
- name: Deploy GUI

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Prepare CMake
5757
run: |
58-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
58+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
5959
env:
6060
CC: clang-19
6161
CXX: clang++-19

.github/workflows/iwyu.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ jobs:
7070
run: |
7171
zypper install -y cmake clang pcre-devel
7272
zypper install -y include-what-you-use-tools
73-
# fixes error during Qt installation
74-
# /__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
75-
zypper install -y libgthread-2_0-0
7673
ln -s iwyu_tool.py /usr/bin/iwyu_tool
7774
7875
# Fails on OpenSUSE:
@@ -89,7 +86,7 @@ jobs:
8986

9087
- name: Prepare CMake
9188
run: |
92-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
89+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
9390
env:
9491
CC: clang
9592
CXX: clang++
@@ -163,7 +160,7 @@ jobs:
163160

164161
- name: Prepare CMake
165162
run: |
166-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
163+
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
167164
env:
168165
CC: clang-19
169166
CXX: clang++-19

.github/workflows/release-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
# see https://www.pcre.org/original/changelog.txt
2929
PCRE_VERSION: 8.45
30-
QT_VERSION: 5.15.2
30+
QT_VERSION: 6.7.2
3131

3232
steps:
3333
- uses: actions/checkout@v4
@@ -76,6 +76,7 @@ jobs:
7676
lrelease gui.pro -removeidentical || exit /b !errorlevel!
7777
7878
- name: Build x64 release GUI
79+
if: false
7980
run: |
8081
; TODO: enable rules?
8182
; specify Release build so matchcompiler is used

.github/workflows/selfcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
# unusedFunction - start
6161
- name: CMake
6262
run: |
63-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
63+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
6464
6565
- name: Generate dependencies
6666
run: |
@@ -87,7 +87,7 @@ jobs:
8787
# unusedFunction notest - start
8888
- name: CMake (no test)
8989
run: |
90-
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
90+
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
9191
9292
- name: Generate dependencies (no test)
9393
run: |
@@ -129,7 +129,7 @@ jobs:
129129
# unusedFunction notest nocli - start
130130
- name: CMake (no test / no cli)
131131
run: |
132-
cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
132+
cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
133133
134134
- name: Generate dependencies (no test / no cli)
135135
run: |

.gitignore

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,42 +50,14 @@ ipch/
5050
*.pbxuser
5151
build/
5252

53-
# GUI build folders
54-
/gui/debug/
55-
/gui/release/
56-
/gui/temp/
57-
/triage/temp
58-
5953
# Other (generated) GUI files
6054
/gui/*.qm
61-
/gui/cppcheck-gui
62-
/gui/cppcheck-gui.exe
63-
/gui/gui.sln
64-
/gui/gui.vcproj
6555
/gui/help/online-help.qch
6656
/gui/help/online-help.qhc
67-
/gui/Makefile
68-
/gui/Makefile.debug
69-
/gui/Makefile.release
70-
/gui/qrc_gui.cpp
71-
/gui/test/Makefile
72-
/gui/test/*/Makefile
73-
/gui/test/*/*/Makefile
74-
/gui/test/benchmark/simple/benchmark-simple
75-
/gui/test/cppchecklibrarydata/qrc_resources.cpp
76-
/gui/test/cppchecklibrarydata/test-cppchecklibrarydata
77-
/gui/test/filelist/test-filelist
78-
/gui/test/projectfile/test-projectfile
79-
/gui/test/translationhandler/test-translationhandler
80-
/gui/test/xmlreportv2/test-xmlreportv2
8157

8258
# Doxygen output folder
8359
doxyoutput/
8460

85-
# qmake generated
86-
htmlreport/.tox/
87-
htmlreport/MANIFEST
88-
8961
# Backup files and stuff from patches
9062
*.rej
9163
*~
@@ -124,9 +96,6 @@ stage
12496
.cache/
12597
compile_commands.json
12698

127-
# qmake
128-
.qmake.stash
129-
13099
#vs code
131100
/.vscode
132101

build-pcre.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@ PCRE is a library that is used by the optional "rules" feature for the command
22
line version of cppcheck. It is readily available on Linux and Mac OS X, but
33
must be obtained separately for Windows.
44

5-
If you're using qmake to generate makefiles, the following behavior applies:
6-
7-
- If you're not on Windows, it assumes by default that you have PCRE and want
8-
to enable rules support. You can disable rules support (removing the PCRE
9-
dependency) by passing HAVE_RULES=no to qmake.
10-
11-
- If you are on Windows, but have PCRE available, you can enable rules support
12-
by passing HAVE_RULES=yes to qmake.
13-
14-
- Note: This includes using build.bat since it calls qmake - to use PCRE and
15-
build.bat, you need to run set HAVE_RULES=yes before each run of build.bat
16-
17-
185
Build instructions
196
------------------
207

cmake/cxx11.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
macro(use_cxx11)
22
# some GitHub Action Windows runners randomly fail with a complaint that Qt6 requires a C++17 compiler
3-
if(MSVC AND USE_QT6)
3+
if(MSVC)
44
# CMAKE_CXX_STANDARD 17 was added in CMake 3.8
55
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
66
else()

0 commit comments

Comments
 (0)