diff options
author | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 11:30:15 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2019-10-20 15:27:51 -0400 |
commit | ad1ba5b56c4e14a615a566d142290977a9be0805 (patch) | |
tree | de3970303047dcca8a6bb1f3f4a6460f2c351c67 /app/app.pri | |
parent | cad9270984244bddf59f796dfb4d7ccef2f9674f (diff) |
Fixes and rework to allow using with cluster demohalibut_8.0.3halibut/8.0.38.0.3
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 <scott.murray@konsulko.com>
Change-Id: Ia42a4303f772bf9c2235c720c92af3faa2936485
Diffstat (limited to 'app/app.pri')
-rw-r--r-- | app/app.pri | 17 |
1 files changed, 0 insertions, 17 deletions
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 |