diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-06-16 00:46:08 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-06-16 05:03:11 +0000 |
| commit | 2f96cf1047608fa5bf83addc52695b1b7d23b28c (patch) | |
| tree | 114a61a02ae6e884a4bba975bccb34452e02a580 | |
| parent | 646cd2fa9b9645d6b5807bcf880af26d1a7aec73 (diff) | |
Add VIS vehicle signal supportmarlin
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 <scott.murray@konsulko.com>
Change-Id: I7cd2511248c67896c91908f56e1f91fd15b7a0dd
| -rw-r--r-- | app/app.pro | 2 | ||||
| -rw-r--r-- | 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 <QQmlApplicationEngine> #include <QDebug> #include <hvac.h> +#include <vehiclesignals.h> #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>("Translator", 1, 0, "Translator"); engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); |