From 4f75c049e8ba1e7fd4f1094f9ed8b681318f021d Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 19 Nov 2024 13:19:46 +0100 Subject: Import Qt6 conversion patch Import the patches for the demo applications into the app repos. Bug-AGL: SPEC-5294 Change-Id: I516a951cdd49dbfb1729bf4e49360333b951bad3 Signed-off-by: Jan-Simon Moeller --- navigation/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'navigation') diff --git a/navigation/meson.build b/navigation/meson.build index 9b8e3ea..5e59f3d 100644 --- a/navigation/meson.build +++ b/navigation/meson.build @@ -1,14 +1,14 @@ -qt5_dep = dependency('qt5', modules: ['Qml']) +qt_dep = dependency('qt6', modules: ['Qml']) -moc_files = qt5.compile_moc(headers: 'navigation.h', - dependencies: qt5_dep) +moc_files = qt.compile_moc(headers: 'navigation.h', + dependencies: qt_dep) src = ['navigation.cpp', moc_files] lib = shared_library('qtappfw-navigation', sources: src, version: '1.0.0', soversion: '0', - dependencies: [qt5_dep, qtappfw_vs_dep], + dependencies: [qt_dep, qtappfw_vs_dep], install: true) install_headers('navigation.h') @@ -18,5 +18,5 @@ pkg_mod.generate(libraries : lib, version : '1.0', name : 'libqtappfw-navigation', filebase : 'qtappfw-navigation', - requires: 'Qt5Qml', + requires: 'Qt6Qml', description : 'Library wrapping AGL navigation API in Qt objects') -- cgit 1.2.3-korg