From d7d65ef59bd9e54787fdebebe39ea0d8e1155769 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 20 Oct 2019 11:30:15 -0400 Subject: Fixes and rework to allow using with cluster demo Changes include: - Remove older libhomescreen and qlibwindowmanager detection and configuration from qmake configuration in favor of PKGCONFIG usage. - Rework main.cpp to look more like ondemandnavi, and use qlibhomescreen instead of libhomescreen. - Update file_operation.{h,cpp} with the newer versions from ondemandnavi that include OSM configuration. - Fixed typo in arrived signal name in org.agl.naviapi.xml and dbus_client.cpp. - Change some qDebug messages in dbus_client.cpp to qWarning as it seems more appropriate. - Rework QtLocation plugin configuration in MapWindow.qml to support OSM and replace mapboxgl with mapbox, as mapboxgl does not seem to work out of the box. - Tweak various things in MapWindow.qml to try to better match the look of ondemandnavi. - Many commenting and whitespace fixes in MapWindow.qml. - Update widget config.xml to add now required display permission, and add the hidden permission so the application will not show up in the launcher. - Add license files for the various header files in include/mapbox, and update README.md to indicate where they come from and what files the different licenses apply to. Bug-AGL: SPEC-2913 Signed-off-by: Scott Murray Change-Id: I192efd45ab94ace8234dbe6c8983257a24e51d23 --- app/app.pri | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'app/app.pri') diff --git a/app/app.pri b/app/app.pri index a1f6562..5dad652 100644 --- a/app/app.pri +++ b/app/app.pri @@ -1,18 +1 @@ -load(configure) - -qtCompileTest(libhomescreen) -qtCompileTest(qlibwindowmanager) - -config_libhomescreen { - CONFIG += link_pkgconfig - PKGCONFIG += libhomescreen - DEFINES += HAVE_LIBHOMESCREEN -} - -config_qlibwindowmanager { - CONFIG += link_pkgconfig - PKGCONFIG += qlibwindowmanager - DEFINES += HAVE_QLIBWINDOWMANAGER -} - DESTDIR = $${OUT_PWD}/../package/root/bin -- cgit 1.2.3-korg