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 /radio | |
| parent | 1d78b4a6f9ba4807901c6fc30ece2b84754908e8 (diff) | |
Import Qt6 conversion patchHEADtrout_19.90.0trout/19.90.019.90.0master
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 'radio')
| -rw-r--r-- | radio/meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/radio/meson.build b/radio/meson.build index 7ae1bac..f4ed0dc 100644 --- a/radio/meson.build +++ b/radio/meson.build @@ -1,9 +1,9 @@ cpp = meson.get_compiler('cpp') grpcpp_reflection_dep = cpp.find_library('grpc++_reflection') -qt5_dep = dependency('qt5', modules: ['Qml']) +qt_dep = dependency('qt6', modules: ['Qml']) radio_dep = [ - qt5_dep, + qt_dep, dependency('protobuf'), dependency('grpc'), dependency('grpc++'), @@ -24,12 +24,12 @@ grpc_gen = generator(protoc, \ output : ['@BASENAME@.grpc.pb.cc', '@BASENAME@.grpc.pb.h'], arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/protos', '--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/radio.proto') -moc_files = qt5.compile_moc(headers: ['RadioClient.h', 'RadioGrpcClient.h'], - dependencies: qt5_dep) +moc_files = qt.compile_moc(headers: ['RadioClient.h', 'RadioGrpcClient.h'], + dependencies: qt_dep) src = [ 'RadioClient.cpp', @@ -53,5 +53,5 @@ pkg_mod.generate(libraries : lib, version : '1.0', name : 'libqtappfw-radio', filebase : 'qtappfw-radio', - requires: 'Qt5Qml', + requires: 'Qt6Qml', description : 'Library wrapping AGL radio API in Qt objects') |