From 65d6157de8d62f93355d403262b0518f250d606b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 7 Jan 2021 16:13:10 -0500 Subject: Remove libhomescreen dependency libhomescreen was still a dependency in the qmake files, remove it. Bug-AGL: SPEC-3757 Signed-off-by: Scott Murray Change-Id: I12df8feab2ac28f3b7419430cb0c0e6902bee18d --- app/app.pri | 9 --------- app/app.pro | 2 +- app/config.tests/libhomescreen/libhomescreen.cpp | 8 -------- app/config.tests/libhomescreen/libhomescreen.pro | 5 ----- 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 app/config.tests/libhomescreen/libhomescreen.cpp delete mode 100644 app/config.tests/libhomescreen/libhomescreen.pro 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 a0d2c1f..fa912b4 100644 --- a/app/app.pro +++ b/app/app.pro @@ -5,7 +5,7 @@ HEADERS = PresetDataObject.h SOURCES = main.cpp PresetDataObject.cpp CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qtappfw-radio +PKGCONFIG += qtappfw-radio CONFIG(release, debug|release) { QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp deleted file mode 100644 index d698b05..0000000 --- a/app/config.tests/libhomescreen/libhomescreen.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -int main(int argc,char **argv) -{ - LibHomeScreen libHomeScreen; - return 0; -} - diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro deleted file mode 100644 index eb4e8f3..0000000 --- a/app/config.tests/libhomescreen/libhomescreen.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = libhomescreen.cpp - -CONFIG -= qt -CONFIG += link_pkgconfig -PKGCONFIG += homescreen -- cgit 1.2.3-korg