Skip to content

Commit 76407d0

Browse files
committed
Remove trikHal, add QtMultimedia module
1 parent 6109f9c commit 76407d0

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

plugins/robots/thirdparty/trikRuntime/trikControl.pri

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@ INCLUDEPATH += \
4949
$$TRIK_CONTROL_ROOT/include/ \
5050
$$TRIK_CONTROL_ROOT/include/trikControl/ \
5151

52+
QT += multimedia
53+
5254
links(trikKernel)
5355
implementationIncludes(trikKernel)

plugins/robots/thirdparty/trikRuntime/trikRuntime.pro

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ SUBDIRS += \
2323
trikKernel \
2424
trikNetwork \
2525
trikControl \
26-
trikHal \
2726
trikCommunicator \
2827
trikScriptRunner \
29-
mlx90640-library \
3028
# translations \
3129

3230
EXTERNAL_SETTINGS = $$PWD/trikRuntimeExternal.pri
@@ -51,12 +49,9 @@ trikKernel.subdir = $$PWD/trikRuntime/trikKernel
5149
trikNetwork.subdir = $$PWD/trikRuntime/trikNetwork
5250
trikControl.file = $$PWD/trikControl.pri
5351
translations.subdir = $$PWD/trikRuntime/translations
54-
trikHal.subdir = $$PWD/trikRuntime/trikHal
55-
mlx90640-library.subdir = $$PWD/trikRuntime/mlx90640-library
5652

57-
trikControl.depends = trikKernel trikHal mlx90640-library
53+
trikControl.depends = trikKernel
5854
trikNetwork.depends = trikKernel
5955
trikScriptRunner.depends += trikControl trikKernel trikNetwork
60-
trikHal.depends = trikKernel
6156
trikCommunicator.depends = trikScriptRunner
6257
OTHER_FILES += trikRuntime/trikRuntime.pro

0 commit comments

Comments
 (0)