From 28028aef174ddce0f1c8317f7fe2bc055db0b295 Mon Sep 17 00:00:00 2001 From: Andrei Radulescu Date: Fri, 19 Jan 2024 23:28:29 +0200 Subject: [PATCH] Support for newer versions of Qt (#31072) * Dynamic QtGui version * Fixed use of undeclared identifier 'va_start' * Fix for Qt deprecations * Fix for dynamic QtGui version * Update selfdrive/ui/SConscript --------- Co-authored-by: Adeeb Shihadeh --- SConstruct | 5 ++++- common/swaglog.cc | 1 + selfdrive/ui/SConscript | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 11b95702c3..a95a77817b 100644 --- a/SConstruct +++ b/SConstruct @@ -297,8 +297,11 @@ else: qt_env['QTDIR'] = qt_install_prefix qt_dirs = [ f"{qt_install_headers}", - f"{qt_install_headers}/QtGui/5.12.8/QtGui", ] + + qt_gui_path = os.path.join(qt_install_headers, "QtGui") + qt_gui_dirs = [d for d in os.listdir(qt_gui_path) if os.path.isdir(os.path.join(qt_gui_path, d))] + qt_dirs += f"{qt_install_headers}/QtGui/{qt_gui_dirs[0]}/QtGui" if qt_gui_dirs else [] qt_dirs += [f"{qt_install_headers}/Qt{m}" for m in qt_modules] qt_libs = [f"Qt5{m}" for m in qt_modules] diff --git a/common/swaglog.cc b/common/swaglog.cc index c22571dc9f..873836b725 100644 --- a/common/swaglog.cc +++ b/common/swaglog.cc @@ -10,6 +10,7 @@ #include #include +#include #include "third_party/json11/json11.hpp" #include "common/version.h" #include "system/hardware/hw.h" diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 7b570b93f8..03006e3b49 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -19,6 +19,9 @@ if arch == "Darwin": del base_libs[base_libs.index('OpenCL')] qt_env['FRAMEWORKS'] += ['OpenCL'] +# FIXME: remove this once we're on 5.15 (24.04) +qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] + qt_util = qt_env.Library("qt_util", ["#selfdrive/ui/qt/api.cc", "#selfdrive/ui/qt/util.cc"], LIBS=base_libs) widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/wifi.cc", "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",