summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-13 20:59:30 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-13 22:12:07 +0300
commit304574420d0dd5949e73df9e238eb136a21af1a3 (patch)
tree22aa320155d8c20acc692ff69c5cdeaba734bb6e
parent04b20723d457e2e101f3c019046948bbe9c34980 (diff)
qcam: Fix compilation errors with gcc-9 and Qt < 5.13
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>
-rw-r--r--src/qcam/meson.build14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/qcam/meson.build b/src/qcam/meson.build
index 21f91f25..1e71f20f 100644
--- a/src/qcam/meson.build
+++ b/src/qcam/meson.build
@@ -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