Skip to content

Commit 7618c8b

Browse files
firewavefirewave
committed
removed qmake and Qt5 support
1 parent f4f4ce8 commit 7618c8b

51 files changed

Lines changed: 49 additions & 1169 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
@@ -99,7 +99,7 @@ jobs:
9999
- name: CMake build (with GUI)
100100
if: matrix.build_gui
101101
run: |
102-
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
102+
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
103103
cmake --build cmake.output -- -j$(nproc)
104104
105105
- name: Run CMake test

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

Lines changed: 6 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-20.04, ubuntu-22.04, macos-12]
24-
include:
25-
- use_qt6: On
26-
- os: ubuntu-20.04
27-
use_qt6: Off
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
# qt6-tools-dev-tools for lprodump
@@ -65,13 +55,13 @@ jobs:
6555
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6656
if: contains(matrix.os, 'ubuntu')
6757
run: |
68-
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
58+
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
6959
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7060
7161
- name: CMake build on macos (with GUI / system tinyxml2)
7262
if: contains(matrix.os, 'macos')
7363
run: |
74-
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
64+
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
7565
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7666
7767
- name: Run CMake test (system tinyxml2)
@@ -83,10 +73,6 @@ jobs:
8373
strategy:
8474
matrix:
8575
os: [ubuntu-20.04, ubuntu-22.04, macos-12]
86-
include:
87-
- use_qt6: On
88-
- os: ubuntu-20.04
89-
use_qt6: Off
9076
fail-fast: false # Prefer quick result
9177

9278
runs-on: ${{ matrix.os }}
@@ -103,12 +89,6 @@ jobs:
10389
with:
10490
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
10591

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

338230
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.2]
30+
qt_ver: [6.7.2]
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.os }}
@@ -47,26 +47,10 @@ 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: |
69-
cmake -S . -B build -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On || exit /b !errorlevel!
53+
cmake -S . -B build -DBUILD_GUI=On -DWITH_QCHART=On || exit /b !errorlevel!
7054
cmake --build build --target cppcheck-gui || exit /b !errorlevel!
7155
7256
# TODO: deploy with CMake/Qt6

‎.github/workflows/clang-tidy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
5555
- name: Prepare CMake
5656
run: |
57-
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
57+
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
5858
env:
5959
CC: clang-19
6060
CXX: clang++-19

‎.github/workflows/iwyu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Prepare CMake
8989
run: |
90-
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
90+
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
9191
env:
9292
CC: clang
9393
CXX: clang++
@@ -160,7 +160,7 @@ jobs:
160160

161161
- name: Prepare CMake
162162
run: |
163-
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
164164
env:
165165
CC: clang-19
166166
CXX: clang++-19

‎.github/workflows/release-windows.yml‎

Lines changed: 3 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
@@ -79,7 +79,9 @@ jobs:
7979
run: python tools\matchcompiler.py --write-dir lib || exit /b !errorlevel!
8080

8181
- name: Build x64 release GUI
82+
if: false
8283
run: |
84+
# TODO: build with CMake
8385
cd gui || exit /b !errorlevel!
8486
qmake HAVE_QCHART=yes || exit /b !errorlevel!
8587
nmake release || exit /b !errorlevel!

‎.github/workflows/selfcheck.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
# unusedFunction - start
6363
- name: CMake
6464
run: |
65-
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
65+
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
6666
6767
- name: Generate dependencies
6868
run: |
@@ -88,7 +88,7 @@ jobs:
8888
# unusedFunction notest - start
8989
- name: CMake (no test)
9090
run: |
91-
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
91+
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
9292
9393
- name: Generate dependencies (no test)
9494
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)