From 9993095f758efb58ff9f311edfc1e160e24e8514 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 7 Jan 2021 16:08:52 -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. Bug-AGL: SPEC-3757 Signed-off-by: Scott Murray Change-Id: I2ffca898fc534d7f57dadee5c3633198e249a735 --- app/app.pri | 9 --------- app/app.pro | 4 ++-- app/main.cpp | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/app.pri b/app/app.pri index c3b1fd1..399d71f 100644 --- a/app/app.pri +++ b/app/app.pri @@ -1,13 +1,4 @@ TEMPLATE = app QMAKE_LFLAGS += "-Wl,--hash-style=gnu -Wl,--as-needed" -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 d14d2cf..54be9ee 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,10 +1,10 @@ TARGET = messaging -QT = quickcontrols2 websockets +QT = quickcontrols2 SOURCES = main.cpp CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qtappfw-bt-map libafbwsc +PKGCONFIG += qtappfw-bt-map libafbwsc CONFIG(release, debug|release) { QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) diff --git a/app/main.cpp b/app/main.cpp index e7c0070..f76917b 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. - * Copyright (C) 2019 Konsulko Group + * Copyright (C) 2019,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. @@ -23,7 +23,6 @@ #include #include #include -#include #include -- cgit 1.2.3-korg