diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:14:21 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:25:53 -0500 |
| commit | ff0e7f9777118469203fe48663f4226d82ecc58b (patch) | |
| tree | 37c9826f7daa6e6ba99438ece061dd62280782af | |
| parent | 89a6741e348b1b3c47dd8e47337f338a9e2c7331 (diff) | |
Remove libhomescreen dependencymarlin_12.90.1marlin_12.90.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi/10.93.0koi/10.92.012.90.112.90.011.92.011.91.010.93.010.92.0
libhomescreen was still a dependency in the qmake files, and its
header file was being pulled in in main.cpp even though there it is
no longer used, remove usage. Also remove unneeded homescreen binding
dependency from the config.xml manifest.
Bug-AGL: SPEC-3757
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I488c28999acf872cd1b80374dd68c8d783c725f5
| -rw-r--r-- | app/app.pri | 9 | ||||
| -rw-r--r-- | app/app.pro | 2 | ||||
| -rw-r--r-- | app/main.cpp | 3 | ||||
| -rw-r--r-- | package/config.xml | 1 |
4 files changed, 2 insertions, 13 deletions
diff --git a/app/app.pri b/app/app.pri index 014646f..f22f540 100644 --- a/app/app.pri +++ b/app/app.pri @@ -1,12 +1,3 @@ TEMPLATE = app -load(configure) -qtCompileTest(libhomescreen) - -config_libhomescreen { - CONFIG += link_pkgconfig - PKGCONFIG += homescreen - DEFINES += HAVE_LIBHOMESCREEN -} - DESTDIR = $${OUT_PWD}/../package/root/bin diff --git a/app/app.pro b/app/app.pro index 8236dd5..2ff2519 100644 --- a/app/app.pro +++ b/app/app.pro @@ -4,7 +4,7 @@ QT = quickcontrols2 websockets SOURCES = main.cpp CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qtappfw-network qtappfw-bt qtappfw-voice qtqrcode-quickitem +PKGCONFIG += qtappfw-network qtappfw-bt qtappfw-voice qtqrcode-quickitem CONFIG(release, debug|release) { QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) diff --git a/app/main.cpp b/app/main.cpp index 655690a..40d0d55 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. - * Copyright (C) 2017 Konsulko Group + * Copyright (C) 2017,2020 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> #include <QtQrCodeQuickItem.hpp> -#include <libhomescreen.hpp> #include <bluetooth.h> #include <network.h> #include <voice.h> diff --git a/package/config.xml b/package/config.xml index f4427ff..aa5c637 100644 --- a/package/config.xml +++ b/package/config.xml @@ -7,7 +7,6 @@ <author>Tasuku Suzuki <tasuku.suzuki@qt.io></author> <license>APL 2.0</license> <feature name="urn:AGL:widget:required-api"> - <param name="homescreen" value="ws" /> <param name="network-manager" value="ws" /> <param name="Bluetooth-Manager" value="ws" /> <param name="vshl-core" value="ws" /> |