From efe4e6da0eb0e66452c09e287ae2e20cfc00a59a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 7 Jan 2021 16:10:50 -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 long unused QT websockets module dependency while cleaning up. Bug-AGL: SPEC-3757 Signed-off-by: Scott Murray Change-Id: I53b1228a3f23bd2d0fdc69acbd5fa8a31b1348c7 --- 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 7a60d44..d7380bb 100644 --- a/app/app.pri +++ b/app/app.pri @@ -1,15 +1,6 @@ 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 copy_ringtone.target = $$DESTDIR/Phone.wav diff --git a/app/app.pro b/app/app.pro index b7b9570..ae6b62e 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,11 +1,11 @@ TARGET = phone -QT = quickcontrols2 websockets +QT = quickcontrols2 SOURCES = main.cpp phone.cpp fileplayer.cpp HEADERS = phone.h numbertype.h fileplayer.h CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qtappfw-phone qtappfw-bt-pbap gstreamer-1.0 +PKGCONFIG += qtappfw-phone qtappfw-bt-pbap gstreamer-1.0 CONFIG(release, debug|release) { QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) diff --git a/app/main.cpp b/app/main.cpp index a12b8ae..9313c39 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. @@ -23,7 +23,6 @@ #include #include #include -#include #include #include -- cgit 1.2.3-korg