NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

qcam: Fix compilation errors with clang-10

Browse source 
clang-10 has introduced the same deprecated-copy warning that appeared
in gcc-9 and caused build issues with Qt header files. However, the
clang version seems more sensitive, and detects issues that are not
fixed in Qt 5.13, unlike gcc-9.

Extend the logic that disables the warning for gcc-9 and Qt < 5.13 to
cover clang-10 and all Qt versions.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2019-09-13 20:59:30 +03:00
parent 1d80ed1feb
commit a8be6e94e7
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/qcam/meson.build
View file

@ -25,13 +25,12 @@ if qt5_dep.found()
qt5_cpp_args = [ '-DQT_NO_KEYWORDS' ]
# gcc 9 introduced a deprecated-copy warning that is triggered by Qt until
# Qt 5.13. Disable it manually.
if cc.get_id() == 'gcc'
gcc_version = cc.version().split('.')
qt5_version = qt5_dep.version().split('.')
if qt5_version[1].to_int() < 13 and gcc_version[0].to_int() >= 9
qt5_cpp_args += [ '-Wno-deprecated-copy' ]
endif
# Qt 5.13. clang 10 introduced the same warning, but detects more issues
# that are not fixed in Qt yet. Disable the warning manually in both cases.
if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and
qt5_dep.version().version_compare('<5.13')) or
(cc.get_id() == 'clang' and cc.version().version_compare('>=10.0')))
qt5_cpp_args += [ '-Wno-deprecated-copy' ]
endif
resources = qt5.preprocess(moc_headers: qcam_moc_headers,