From ff0e7f9777118469203fe48663f4226d82ecc58b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 7 Jan 2021 16:14:21 -0500 Subject: Remove libhomescreen dependency 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 Change-Id: I488c28999acf872cd1b80374dd68c8d783c725f5 --- app/app.pri | 9 --------- app/app.pro | 2 +- app/main.cpp | 3 +-- 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 #include #include -#include #include #include #include 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 @@ Tasuku Suzuki <tasuku.suzuki@qt.io> APL 2.0 - -- cgit 1.2.3-korg