diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 13:19:46 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 13:19:56 +0100 |
| commit | 4f75c049e8ba1e7fd4f1094f9ed8b681318f021d (patch) | |
| tree | aa98230ff962aeba9775c459515b229c8eac47a0 /vehicle-signals | |
| parent | 1d78b4a6f9ba4807901c6fc30ece2b84754908e8 (diff) | |
Import the patches for the demo applications into the app repos.
Bug-AGL: SPEC-5294
Change-Id: I516a951cdd49dbfb1729bf4e49360333b951bad3
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'vehicle-signals')
| -rw-r--r-- | vehicle-signals/QtKuksaClient.cpp | 2 | ||||
| -rw-r--r-- | vehicle-signals/meson.build | 14 | ||||
| -rw-r--r-- | vehicle-signals/vehiclesignals.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vehicle-signals/QtKuksaClient.cpp b/vehicle-signals/QtKuksaClient.cpp index 901459d..e258670 100644 --- a/vehicle-signals/QtKuksaClient.cpp +++ b/vehicle-signals/QtKuksaClient.cpp @@ -84,7 +84,7 @@ QtKuksaClient::QtKuksaClient(const std::shared_ptr< ::grpc::ChannelInterface>& c void QtKuksaClient::connect() { // Check for connection in another thread - QFuture<void> future = QtConcurrent::run(this, &QtKuksaClient::waitForConnected); + QFuture<void> future = QtConcurrent::run(&QtKuksaClient::waitForConnected, this); } void QtKuksaClient::get(const QString &path, const bool actuator) diff --git a/vehicle-signals/meson.build b/vehicle-signals/meson.build index 50383e4..4dd766c 100644 --- a/vehicle-signals/meson.build +++ b/vehicle-signals/meson.build @@ -1,10 +1,10 @@ cpp = meson.get_compiler('cpp') grpcpp_reflection_dep = cpp.find_library('grpc++_reflection') -qt5_dep = dependency('qt5', modules: ['Core', 'Concurrent']) +qt_dep = dependency('qt6', modules: ['Core', 'Concurrent']) vs_dep = [ - qt5_dep, + qt_dep, dependency('protobuf'), dependency('grpc'), dependency('grpc++'), @@ -30,14 +30,14 @@ grpc_gen = generator(protoc, \ output : ['@BASENAME@.grpc.pb.cc', '@BASENAME@.grpc.pb.h'], arguments : ['-I=' + protos_base_dir, '--grpc_out=@BUILD_DIR@', - '--plugin=protoc-gen-grpc=' + grpc_cpp.path(), + '--plugin=protoc-gen-grpc=' + grpc_cpp.full_path(), '@INPUT@']) generated_grpc_sources = [ \ grpc_gen.process(protos_dir / 'val.proto', preserve_path_from : protos_base_dir), ] -moc_files = qt5.compile_moc(headers: [ 'vehiclesignals.h', 'QtKuksaClient.h' ], - dependencies: qt5_dep) +moc_files = qt.compile_moc(headers: [ 'vehiclesignals.h', 'QtKuksaClient.h' ], + dependencies: qt_dep) src = [ 'vehiclesignals.cpp', @@ -62,10 +62,10 @@ pkg_mod.generate(libraries: lib, version: '1.0', name: 'libqtappfw-vehicle-signals', filebase: 'qtappfw-vehicle-signals', - requires: ['Qt5Core'], + requires: ['Qt6Core'], description: 'Library wrapping VSS API in Qt objects') -qtappfw_vs_dep = declare_dependency(dependencies: qt5_dep, +qtappfw_vs_dep = declare_dependency(dependencies: qt_dep, link_with: lib, include_directories: '.', sources: ['vehiclesignals.h']) diff --git a/vehicle-signals/vehiclesignals.cpp b/vehicle-signals/vehiclesignals.cpp index adf371a..f550955 100644 --- a/vehicle-signals/vehiclesignals.cpp +++ b/vehicle-signals/vehiclesignals.cpp @@ -160,7 +160,7 @@ void VehicleSignals::onSubscribeDone(const QMap<QString, bool> &signals_, bool c { if (!canceled) { // queue up a resubscribe attempt - QFuture<void> future = QtConcurrent::run(this, &VehicleSignals::resubscribe, signals_); + QFuture<void> future = QtConcurrent::run(&VehicleSignals::resubscribe, this, signals_); } } |