aboutsummaryrefslogtreecommitdiffstats
path: root/app/app.pro
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-10-20 11:30:15 -0400
committerScott Murray <scott.murray@konsulko.com>2019-10-20 15:27:51 -0400
commitad1ba5b56c4e14a615a566d142290977a9be0805 (patch)
treede3970303047dcca8a6bb1f3f4a6460f2c351c67 /app/app.pro
parentcad9270984244bddf59f796dfb4d7ccef2f9674f (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.pro')
-rw-r--r--app/app.pro7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/app.pro b/app/app.pro
index 0be8cd9..af6d775 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -2,15 +2,12 @@ TARGET = tbtnavi
TEMPLATE = app
QT += qml network quick positioning location sql widgets dbus
+PKGCONFIG += qlibhomescreen qlibwindowmanager
-CONFIG += c++1z
+CONFIG += c++1z link_pkgconfig
include(app.pri)
-ios|android {
- QT -= widgets
-}
-
SOURCES += \
main.cpp \
qcheapruler.cpp \