diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:13:10 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:25:38 -0500 |
commit | 65d6157de8d62f93355d403262b0518f250d606b (patch) | |
tree | 56678776a20a8b4ae4b09ccfb8c67b1a7f4f0c22 | |
parent | 1888b09778751bcc51961b44e80875454026a5e2 (diff) |
Remove libhomescreen dependencymarlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.92.0marlin/12.91.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.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.0
libhomescreen was still a dependency in the qmake files, remove it.
Bug-AGL: SPEC-3757
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I12df8feab2ac28f3b7419430cb0c0e6902bee18d
-rw-r--r-- | app/app.pri | 9 | ||||
-rw-r--r-- | app/app.pro | 2 | ||||
-rw-r--r-- | app/config.tests/libhomescreen/libhomescreen.cpp | 8 | ||||
-rw-r--r-- | app/config.tests/libhomescreen/libhomescreen.pro | 5 |
4 files changed, 1 insertions, 23 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 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 <libhomescreen.hpp> - -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 |