diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:08:52 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:23:37 -0500 |
commit | 9993095f758efb58ff9f311edfc1e160e24e8514 (patch) | |
tree | d537d280fab2d269a636bcc110b4c49b5a7e2a37 | |
parent | 0807d0563bd55a685fa17fad1d587a596220e3ab (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, 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 <scott.murray@konsulko.com>
Change-Id: I2ffca898fc534d7f57dadee5c3633198e249a735
-rw-r--r-- | app/app.pri | 9 | ||||
-rw-r--r-- | app/app.pro | 4 | ||||
-rw-r--r-- | 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 <QtQml/QQmlContext> #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> -#include <libhomescreen.hpp> #include <map.h> |