From 5b0fa80e6a55b31f96537c6714519222374b8cc3 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 10 Sep 2018 21:01:59 +0900 Subject: delete qtappfw for SPEC_1680 test --- app/app.pro | 2 +- app/main.cpp | 4 ---- package/config.xml | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/app.pro b/app/app.pro index 23dce89..7092714 100644 --- a/app/app.pro +++ b/app/app.pro @@ -4,7 +4,7 @@ QT = quickcontrols2 websockets dbus SOURCES = main.cpp CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen qlibwindowmanager qtappfw +PKGCONFIG += libhomescreen qlibwindowmanager RESOURCES += \ settings.qrc \ diff --git a/app/main.cpp b/app/main.cpp index b4c5be3..dfd3a51 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include class DBus : public QObject @@ -85,7 +83,6 @@ int main(int argc, char *argv[]) bindingAddressWS.setQuery(query); QQmlContext *context = engine.rootContext(); context->setContextProperty(QStringLiteral("bindingAddressWS"), bindingAddressWS); - context->setContextProperty("network", new Network(bindingAddressWS, context)); std::string token = secret.toStdString(); LibHomeScreen* hs = new LibHomeScreen(); @@ -143,7 +140,6 @@ int main(int argc, char *argv[]) DBus dbus; engine.rootContext()->setContextProperty("dbus", &dbus); - engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddressWS)); engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo); engine.load(QUrl(QStringLiteral("qrc:/Settings.qml"))); QObject *root = engine.rootObjects().first(); diff --git a/package/config.xml b/package/config.xml index 4ca6eaa..53b75b1 100644 --- a/package/config.xml +++ b/package/config.xml @@ -9,8 +9,6 @@ - - -- cgit 1.2.3-korg