summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-09-10 21:01:59 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2018-09-10 21:01:59 +0900
commit5b0fa80e6a55b31f96537c6714519222374b8cc3 (patch)
treee4484d20e6102b57c1d5e6a4d9560fc164b65953
parent087d29529292db2e6b6e654254b6600d95a3a43a (diff)
delete qtappfw for SPEC_1680 testsandbox/zheng_wenlong/double_free_test
-rw-r--r--app/app.pro2
-rw-r--r--app/main.cpp4
-rw-r--r--package/config.xml2
3 files changed, 1 insertions, 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 <QtQuickControls2/QQuickStyle>
#include <QQuickWindow>
#include <libhomescreen.hpp>
-#include <bluetooth.h>
-#include <network.h>
#include <qlibwindowmanager.h>
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 @@
<feature name="urn:AGL:widget:required-api">
<param name="windowmanager" value="ws" />
<param name="homescreen" value="ws" />
- <param name="network-manager" value="ws" />
- <param name="Bluetooth-Manager" value="ws" />
</feature>
<feature name="urn:AGL:widget:required-permission">
<param name="urn:AGL:permission::public:no-htdocs" value="required" />