diff options
-rw-r--r-- | app/app.pri | 9 | ||||
-rw-r--r-- | app/app.pro | 2 | ||||
-rw-r--r-- | app/main.cpp | 3 | ||||
-rw-r--r-- | package/config.xml | 1 |
4 files changed, 2 insertions, 13 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 8236dd5..2ff2519 100644 --- a/app/app.pro +++ b/app/app.pro @@ -4,7 +4,7 @@ QT = quickcontrols2 websockets SOURCES = main.cpp CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qtappfw-network qtappfw-bt qtappfw-voice qtqrcode-quickitem +PKGCONFIG += qtappfw-network qtappfw-bt qtappfw-voice qtqrcode-quickitem CONFIG(release, debug|release) { QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) diff --git a/app/main.cpp b/app/main.cpp index 655690a..40d0d55 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. @@ -25,7 +25,6 @@ #include <QtQuickControls2/QQuickStyle> #include <QQuickWindow> #include <QtQrCodeQuickItem.hpp> -#include <libhomescreen.hpp> #include <bluetooth.h> #include <network.h> #include <voice.h> diff --git a/package/config.xml b/package/config.xml index f4427ff..aa5c637 100644 --- a/package/config.xml +++ b/package/config.xml @@ -7,7 +7,6 @@ <author>Tasuku Suzuki <tasuku.suzuki@qt.io></author> <license>APL 2.0</license> <feature name="urn:AGL:widget:required-api"> - <param name="homescreen" value="ws" /> <param name="network-manager" value="ws" /> <param name="Bluetooth-Manager" value="ws" /> <param name="vshl-core" value="ws" /> |