diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:10:50 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-01-07 16:23:49 -0500 |
| commit | efe4e6da0eb0e66452c09e287ae2e20cfc00a59a (patch) | |
| tree | 3c3f36a0555cb8999ff3e791089aa288bcffde7f | |
| parent | 8608a8ac991466455bb6ec90ec6a4c5e756280ba (diff) | |
Remove libhomescreen dependencykoi_10.93.0koi_10.92.0koi/10.93.0koi/10.92.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. Also remove long unused QT websockets
module dependency while cleaning up.
Bug-AGL: SPEC-3757
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I53b1228a3f23bd2d0fdc69acbd5fa8a31b1348c7
| -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 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 <QtQml/QQmlContext> #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> -#include <libhomescreen.hpp> #include <pbap.h> #include <telephony.h> |