PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcam: Fix compilation errors with gcc-9 and Qt < 5.13

Browse Source 
gcc-9 has introduced a deprecated-copy warning that is triggered by Qt
header files. The issue has been fixed in Qt 5.13. Fix compilation with
earlier Qt versions by disabling the warning. In order to still benefit
from the warning when possible, only disable it for gcc-9 and Qt < 5.13.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2019-09-13 20:59:30 +03:00
parent 04b20723d4
commit 304574420d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qcam/meson.build
View File

@@ -18,11 +18,23 @@ qt5_dep = dependency('qt5',
required : false)
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
endif
moc_files = qt5.preprocess(moc_headers: qcam_moc_headers,
dependencies: qt5_dep)
qcam = executable('qcam', qcam_sources, moc_files,
install : true,
dependencies : [libcamera_dep, qt5_dep],
cpp_args : '-DQT_NO_KEYWORDS')
cpp_args : qt5_cpp_args)
endif