delete qtappfw for SPEC_1680 test sandbox/zheng_wenlong/double_free_test
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>
Mon, 10 Sep 2018 12:01:59 +0000 (21:01 +0900)
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>
Mon, 10 Sep 2018 12:01:59 +0000 (21:01 +0900)
app/app.pro
app/main.cpp
package/config.xml

index 23dce89..7092714 100644 (file)
@@ -4,7 +4,7 @@ QT = quickcontrols2 websockets dbus
 SOURCES = main.cpp
 
 CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen qlibwindowmanager qtappfw
+PKGCONFIG += libhomescreen qlibwindowmanager
 
 RESOURCES += \ 
     settings.qrc \
index b4c5be3..dfd3a51 100644 (file)
@@ -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();
index 4ca6eaa..53b75b1 100644 (file)
@@ -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" />