Qt is optional (#37295)

* Qt is optional

* cleanup

SConstruct

@@ -211,10 +211,8 @@ SConscript(['third_party/SConscript'])
 
 SConscript(['selfdrive/SConscript'])
 
-if Dir('#tools/cabana/').exists() and GetOption('extras'):
-  SConscript(['tools/replay/SConscript'])
-  if arch != "larch64":
-    SConscript(['tools/cabana/SConscript'])
+if Dir('#tools/cabana/').exists() and arch != "larch64":
+  SConscript(['tools/cabana/SConscript'])
 
 
 env.CompilationDatabase('compile_commands.json')

tools/cabana/.gitignore

@@ -1,6 +1,6 @@
 moc_*
 *.moc
 
-cabana
+_cabana
 dbc/car_fingerprint_to_dbc.json
 tests/test_cabana

tools/cabana/SConscript

@@ -1,14 +1,27 @@
 import subprocess
 import os
+import shutil
 
-Import('env', 'arch', 'common', 'messaging', 'visionipc', 'replay_lib', 'cereal')
+Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
+
+# Detect Qt - skip build if not available
+if arch == "Darwin":
+  brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
+  has_qt = os.path.isdir(os.path.join(brew_prefix, "opt/qt@5"))
+else:
+  has_qt = shutil.which('qmake') is not None
+
+if not has_qt:
+  Return()
+
+SConscript(['#tools/replay/SConscript'])
+Import('replay_lib')
 
 qt_env = env.Clone()
 qt_modules = ["Widgets", "Gui", "Core", "Network", "Concurrent", "DBus", "Xml"]
 
 qt_libs = []
 if arch == "Darwin":
-  brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
   qt_env['QTDIR'] = f"{brew_prefix}/opt/qt@5"
   qt_dirs = [
     os.path.join(qt_env['QTDIR'], "include"),
@@ -31,12 +44,7 @@ else:
   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]
-  if arch == "larch64":
-    qt_libs += ["GLESv2", "wayland-client"]
-    qt_env.PrependENVPath('PATH', Dir("#third_party/qt5/larch64/bin/").abspath)
-  elif arch != "Darwin":
-    qt_libs += ["GL"]
+  qt_libs = [f"Qt5{m}" for m in qt_modules] + ["GL"]
 qt_env['QT3DIR'] = qt_env['QTDIR']
 qt_env.Tool('qt3')
 
@@ -83,7 +91,7 @@ cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/socketcans
                                                'chart/chartswidget.cc', 'chart/chart.cc', 'chart/signalselector.cc', 'chart/tiplabel.cc', 'chart/sparkline.cc',
                                                'commands.cc', 'messageswidget.cc', 'streamselector.cc', 'settings.cc', 'panda.cc',
                                                'cameraview.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc', 'tools/findsignal.cc', 'tools/routeinfo.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
-cabana_env.Program('cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
+cabana_env.Program('_cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
 
 if GetOption('extras'):
   cabana_env.Program('tests/test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs])

tools/cabana/cabana

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+ROOT="$(cd "$DIR/../../" && pwd)"
+
+install_qt() {
+  if [[ "$(uname)" == "Darwin" ]]; then
+    brew install qt@5
+    brew link qt@5 || true
+  else
+    SUDO=""
+    if [[ ! $(id -u) -eq 0 ]]; then
+      SUDO="sudo"
+    fi
+    $SUDO apt-get install -y --no-install-recommends \
+      qtbase5-dev \
+      qtbase5-dev-tools \
+      qttools5-dev-tools \
+      libqt5charts5-dev \
+      libqt5svg5-dev \
+      libqt5serialbus5-dev \
+      libqt5x11extras5-dev \
+      libqt5opengl5-dev
+  fi
+}
+
+# Install Qt if not found
+if ! command -v qmake &> /dev/null; then
+  echo "Qt not found, installing dependencies..."
+  install_qt
+fi
+
+# Build _cabana
+cd "$ROOT"
+scons -j"$(nproc)" tools/cabana/_cabana
+
+exec "$DIR/_cabana" "$@"

tools/install_ubuntu_dependencies.sh

@@ -52,18 +52,12 @@ function install_ubuntu_common_requirements() {
     libglfw3-dev \
     libglib2.0-0 \
     libjpeg-dev \
-    libqt5charts5-dev \
     libncurses5-dev \
     libusb-1.0-0-dev \
     libzmq3-dev \
     libzstd-dev \
     libsqlite3-dev \
     portaudio19-dev \
-    qttools5-dev-tools \
-    libqt5svg5-dev \
-    libqt5serialbus5-dev  \
-    libqt5x11extras5-dev \
-    libqt5opengl5-dev \
     gettext
 }
 
@@ -73,8 +67,6 @@ function install_ubuntu_lts_latest_requirements() {
 
   $SUDO apt-get install -y --no-install-recommends \
     g++-12 \
-    qtbase5-dev \
-    qtbase5-dev-tools \
     python3-dev \
     python3-venv
 }

tools/mac_setup.sh

@@ -36,7 +36,6 @@ brew "glfw"
 brew "libusb"
 brew "libtool"
 brew "llvm"
-brew "qt@5"
 brew "zeromq"
 cask "gcc-arm-embedded"
 brew "portaudio"
@@ -56,27 +55,6 @@ export CPPFLAGS="$CPPFLAGS -I${BREW_PREFIX}/opt/bzip2/include"
 $DIR/install_python_dependencies.sh
 echo "[ ] installed python dependencies t=$SECONDS"
 
-# brew does not link qt5 by default
-# check if qt5 can be linked, if not, prompt the user to link it
-QT_BIN_LOCATION="$(command -v lupdate || :)"
-if [ -n "$QT_BIN_LOCATION" ]; then
-  # if qt6 is linked, prompt the user to unlink it and link the right version
-  QT_BIN_VERSION="$(lupdate -version | awk '{print $NF}')"
-  if [[ ! "$QT_BIN_VERSION" =~ 5\.[0-9]+\.[0-9]+ ]]; then
-    echo
-    echo "lupdate/lrelease available at PATH is $QT_BIN_VERSION"
-    if [[ "$QT_BIN_LOCATION" == "$(brew --prefix)/"* ]]; then
-      echo "Run the following command to link qt5:"
-      echo "brew unlink qt@6 && brew link qt@5"
-    else
-      echo "Remove conflicting qt entries from PATH and run the following command to link qt5:"
-      echo "brew link qt@5"
-    fi
-  fi
-else
-  brew link qt@5
-fi
-
 echo
 echo "----   OPENPILOT SETUP DONE   ----"
 echo "Open a new shell or configure your active shell env by running:"