remove Qt wrapper scripts (#30454)

* remove Qt wrapper scripts

* revert those
old-commit-hash: 3831bf19e4
chrysler-long2
Adeeb Shihadeh 1 year ago committed by GitHub
parent 7bbf0c072d
commit 2526dcf30c
  1. 1
      .gitignore
  2. 1
      release/files_common
  3. 4
      selfdrive/test/test_onroad.py
  4. 1
      selfdrive/ui/.gitignore
  5. 2
      selfdrive/ui/SConscript
  6. 2
      selfdrive/ui/qt/util.cc
  7. 4
      selfdrive/ui/ui

1
.gitignore vendored

@ -46,7 +46,6 @@ selfdrive/boardd/boardd
selfdrive/logcatd/logcatd
selfdrive/mapd/default_speeds_by_region.json
system/proclogd/proclogd
selfdrive/ui/_ui
selfdrive/ui/translations/alerts_generated.h
selfdrive/ui/translations/tmp
selfdrive/test/longitudinal_maneuvers/out

@ -285,7 +285,6 @@ selfdrive/ui/.gitignore
selfdrive/ui/SConscript
selfdrive/ui/*.cc
selfdrive/ui/*.h
selfdrive/ui/ui
selfdrive/ui/text
selfdrive/ui/spinner
selfdrive/ui/soundd.py

@ -36,7 +36,7 @@ PROCS = {
"./locationd": 11.0,
"./mapsd": (1.0, 10.0),
"selfdrive.controls.plannerd": 11.0,
"./_ui": 18.0,
"./ui": 18.0,
"selfdrive.locationd.paramsd": 9.0,
"./sensord": 7.0,
"selfdrive.controls.radard": 4.5,
@ -303,7 +303,7 @@ class TestOnroad(unittest.TestCase):
self.assertLessEqual(max(mems) - min(mems), 3.0)
def test_gpu_usage(self):
self.assertEqual(self.gpu_procs, {"weston", "_ui", "camerad", "selfdrive.modeld.modeld"})
self.assertEqual(self.gpu_procs, {"weston", "ui", "camerad", "selfdrive.modeld.modeld"})
def test_camera_processing_time(self):
result = "\n"

@ -3,6 +3,7 @@ moc_*
translations/main_test_en.*
ui
watch3
installer/installers/*
qt/text

@ -77,7 +77,7 @@ qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
# build main UI
qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs)
if GetOption('extras'):
qt_src.remove("main.cc") # replaced by test_runner
qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)

@ -112,6 +112,8 @@ void initApp(int argc, char *argv[], bool disable_hidpi) {
#endif
}
qputenv("QT_DBL_CLICK_DIST", QByteArray::number(150));
setQtSurfaceFormat();
}

@ -1,4 +0,0 @@
#!/bin/sh
cd "$(dirname "$0")"
export QT_DBL_CLICK_DIST=150
exec ./_ui
Loading…
Cancel
Save