From d37674bb6dbb5ceb15c650a0344b0caf624963bc Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 16 Jun 2022 00:46:08 -0400 Subject: [PATCH] Add VIS vehicle signal support Update the use of the HVAC API from libqtappfw for its rework to use VIS signals instead of the previous signal-composer usage. Bug-AGL: SPEC-4409 Signed-off-by: Scott Murray Change-Id: I7cd2511248c67896c91908f56e1f91fd15b7a0dd --- app/app.pro | 2 +- app/main.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/app.pro b/app/app.pro index 8c4c5a4..14e7c44 100644 --- a/app/app.pro +++ b/app/app.pro @@ -3,7 +3,7 @@ TARGET = hvac QT = qml quick CONFIG += c++11 link_pkgconfig -PKGCONFIG += qtappfw-hvac +PKGCONFIG += qtappfw-hvac qtappfw-vehicle-signals HEADERS += \ translator.h diff --git a/app/main.cpp b/app/main.cpp index c320ef8..e4f87bf 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2022 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +19,7 @@ #include #include #include +#include #include "translator.h" @@ -28,7 +30,8 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - engine.rootContext()->setContextProperty("hvac", new HVAC()); + VehicleSignalsConfig vsConfig("hvac"); + engine.rootContext()->setContextProperty("hvac", new HVAC(new VehicleSignals(vsConfig))); qmlRegisterType("Translator", 1, 0, "Translator"); engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); -- 2.16.6