binding: wifi: switch from qmake to cmakeeel_4.99.3 eel_4.99.2 eel_4.99.1 eel/4.99.3 eel/4.99.2 eel/4.99.1 4.99.3 4.99.2 4.99.1

Switch from legacy qmake to cmake to build binding Bug-AGL: SPEC-823 Change-Id: I55532be199415a4d4adb441446c1143da9ef8edf Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
author: Matt Ranostay <matt.ranostay@konsulko.com> 2017-08-11 12:31:35 -0700
committer: Matt Ranostay <matt.ranostay@konsulko.com> 2017-08-11 18:48:55 -0700
commit: af8fd545eee24fb2d6a8d472912f9c606b044278 (patch)
tree: 4e136a2b7a9524a53af669d76883f9a03b83c9e7
parent: 90891cc99c6be8002302e5b68e205cb43df91636 (diff)
18 files changed, 373 insertions, 345 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b545da1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "conf.d/app-templates"]
+	path = conf.d/app-templates
+	url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..b485097
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,21 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Romain Forlot <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)
diff --git a/agl-service-wifi.pro b/agl-service-wifi.pro
deleted file mode 100644
index c60b30b..0000000
--- a/agl-service-wifi.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = binding-wifi package
-package.depends += binding-wifi
diff --git a/binding-wifi/CMakeLists.txt b/binding-wifi/CMakeLists.txt
new file mode 100644
index 0000000..54fef96
--- /dev/null
+++ b/binding-wifi/CMakeLists.txt
@@ -0,0 +1,43 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Add target to project dependency list
+PROJECT_TARGET_ADD(wifi-binding)
+
+	# Define project Targets
+	add_library(${TARGET_NAME} MODULE
+		agent.c
+		wifi-api.c
+		wifi-connman.c)
+
+	# Binder exposes a unique public entry point
+	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+		PREFIX "libafm-"
+		LABELS "BINDING"
+		LINK_FLAGS ${BINDINGS_LINK_FLAG}
+		OUTPUT_NAME ${TARGET_NAME}
+	)
+
+	# Library dependencies (include updates automatically)
+	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries})
+
+	# installation directory
+	INSTALL(TARGETS ${TARGET_NAME}
+		LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
+
diff --git a/binding-wifi/agent.o b/binding-wifi/agent.o
new file mode 100644
index 0000000..4e2dd65
--- /dev/null
+++ b/binding-wifi/agent.o
diff --git a/binding-wifi/binding-wifi.pro b/binding-wifi/binding-wifi.pro
deleted file mode 100644
index 11538e1..0000000
--- a/binding-wifi/binding-wifi.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = agl-wifi-binding
-
-HEADERS = wifi-api.h wifi-connman.h
-SOURCES = agent.c wifi-api.c wifi-connman.c
-
-LIBS += -Wl,--version-script=$$PWD/export.map
-
-CONFIG += link_pkgconfig
-PKGCONFIG += json-c afb-daemon glib-2.0 gio-2.0 gobject-2.0 zlib
-
-include(binding.pri)
diff --git a/binding-wifi/binding.pri b/binding-wifi/binding.pri
deleted file mode 100644
index 3448a56..0000000
--- a/binding-wifi/binding.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin use_c_linker
-CONFIG -= qt
-QMAKE_CFLAGS += -Wextra -Wconversion -Wno-unused-parameter -Werror=maybe-uninitialized -Werror=implicit-function-declaration -ffunction-sections -fdata-sections -Wl,--as-needed -Wl,--gc-sections
-
-DESTDIR = $${OUT_PWD}/../package/root/lib
diff --git a/binding-wifi/export.map b/binding-wifi/export.map
deleted file mode 100644
index eea0d7b..0000000
--- a/binding-wifi/export.map
+++ /dev/null
@@ -1 +0,0 @@
-{ global: afbBindingV2*; local: *; };
diff --git a/binding-wifi/wifi-api.o b/binding-wifi/wifi-api.o
new file mode 100644
index 0000000..27b92b8
--- /dev/null
+++ b/binding-wifi/wifi-api.o
diff --git a/binding-wifi/wifi-connman.o b/binding-wifi/wifi-connman.o
new file mode 100644
index 0000000..f756649
--- /dev/null
+++ b/binding-wifi/wifi-connman.o
diff --git a/conf.d/app-templates b/conf.d/app-templates
new file mode 160000
+Subproject 8967162dd12bce89f9ae27f5c9bce7b78624e3f
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
new file mode 100755
index 0000000..759f6be
--- /dev/null
+++ b/conf.d/autobuild/agl/autobuild
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+# Copyright (C) 2015, 2016 "IoT.bzh"
+# Author "Romain Forlot" <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	 http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+THISFILE  := $(lastword $(MAKEFILE_LIST))
+BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
+
+.PHONY: all clean distclean configure build package help
+
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- clean"
+	@echo "- distclean"
+	@echo "- configure"
+	@echo "- build"
+	@echo "- package"
+	@echo ""
+	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
+	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
+
+clean:
+	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
+
+distclean:
+	@rm -rf ${BUILD_DIR}
+
+configure: ${BUILD_DIR}/Makefile
+
+build: configure
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
+package: build
+	@mkdir -p ${BUILD_DIR}/$@/bin
+	@mkdir -p ${BUILD_DIR}/$@/etc
+	@mkdir -p ${BUILD_DIR}/$@/lib
+	@mkdir -p ${BUILD_DIR}/$@/htdocs
+	@mkdir -p ${BUILD_DIR}/$@/data
+	@cmake --build ${BUILD_DIR} --target widget
+	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
+
+${BUILD_DIR}/Makefile:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
new file mode 100755
index 0000000..759f6be
--- /dev/null
+++ b/conf.d/autobuild/linux/autobuild
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+# Copyright (C) 2015, 2016 "IoT.bzh"
+# Author "Romain Forlot" <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	 http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+THISFILE  := $(lastword $(MAKEFILE_LIST))
+BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
+
+.PHONY: all clean distclean configure build package help
+
+all: help
+
+help:
+	@echo "List of targets available:"
+	@echo ""
+	@echo "- all"
+	@echo "- clean"
+	@echo "- distclean"
+	@echo "- configure"
+	@echo "- build"
+	@echo "- package"
+	@echo ""
+	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
+	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
+
+clean:
+	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
+
+distclean:
+	@rm -rf ${BUILD_DIR}
+
+configure: ${BUILD_DIR}/Makefile
+
+build: configure
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
+package: build
+	@mkdir -p ${BUILD_DIR}/$@/bin
+	@mkdir -p ${BUILD_DIR}/$@/etc
+	@mkdir -p ${BUILD_DIR}/$@/lib
+	@mkdir -p ${BUILD_DIR}/$@/htdocs
+	@mkdir -p ${BUILD_DIR}/$@/data
+	@cmake --build ${BUILD_DIR} --target widget
+	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
+
+${BUILD_DIR}/Makefile:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
new file mode 100644
index 0000000..dae59cf
--- /dev/null
+++ b/conf.d/cmake/config.cmake
@@ -0,0 +1,162 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Project Info
+# ------------------
+set(PROJECT_NAME agl-service-wifi)
+set(PROJECT_VERSION "1.0")
+set(PROJECT_PRETTY_NAME "WiFi binding service")
+set(PROJECT_DESCRIPTION "Expose WiFi Low Level APIs through AGL Framework")
+set(PROJECT_ICON "icon.png")
+set(PROJECT_AUTHOR "Tasuku Suzuki")
+set(PROJECT_AUTHOR_MAIL "tasuku.suzuki@qt.io")
+set(PROJECT_LICENSE "APL2.0")
+set(PROJECT_LANGUAGES,"C")
+
+# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# relative to the root project directory
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+
+# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
+# but used and must be built and linked.
+# set(PROJECT_LIBDIR "libs")
+
+# Where are stored data for your application. Pictures, static resources must be placed in that folder.
+# set(PROJECT_RESOURCES "data")
+
+# Which directories inspect to find CMakeLists.txt target files
+# set(PROJECT_SRC_DIR_PATTERN "*")
+
+# Compilation Mode (DEBUG, RELEASE)
+# ----------------------------------
+set(CMAKE_BUILD_TYPE "DEBUG")
+
+# Kernel selection if needed. You can choose between a
+# mandatory version to impose a minimal version.
+# Or check Kernel minimal version and just print a Warning
+# about missing features and define a preprocessor variable
+# to be used as preprocessor condition in code to disable
+# incompatibles features. Preprocessor define is named
+# KERNEL_MINIMAL_VERSION_OK.
+#
+# NOTE*** FOR NOW IT CHECKS KERNEL Yocto environment and
+# Yocto SDK Kernel version.
+# -----------------------------------------------
+#set(kernel_mandatory_version 4.8)
+
+# Compiler selection if needed. Impose a minimal version.
+# -----------------------------------------------
+set (gcc_minimal_version 4.9)
+
+# PKG_CONFIG required packages
+# -----------------------------
+set (PKG_REQUIRED_LIST
+	json-c
+	libsystemd>=222
+	afb-daemon
+	json-c
+	glib-2.0
+	gio-2.0
+	gobject-2.0
+	zlib
+)
+
+# Static constante definition
+# -----------------------------
+add_compile_options(-DPB_FIELD_16BIT)
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-pthread>)
+
+# Customize link option
+# -----------------------------
+list (APPEND link_libraries -pthread)
+
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
+# ---------------------------------------------------------------------
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+
+# Optional location for config.xml.in
+# -----------------------------------
+set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
+
+# Mandatory widget Mimetype specification of the main unit
+# --------------------------------------------------------------------------
+# Choose between :
+#- text/html : HTML application,
+#	content.src designates the home page of the application
+#
+#- application/vnd.agl.native : AGL compatible native,
+#	content.src designates the relative path of the binary.
+#
+# - application/vnd.agl.service: AGL service, content.src is not used.
+#
+#- ***application/x-executable***: Native application,
+#	content.src designates the relative path of the binary.
+#	For such application, only security setup is made.
+#
+set(WIDGET_TYPE application/vnd.agl.service)
+
+# Mandatory Widget entry point file of the main unit
+# --------------------------------------------------------------
+# This is the file that will be executed, loaded,
+# at launch time by the application framework.
+#
+set(WIDGET_ENTRY_POINT lib/libafm-wifi-binding.so)
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --binding=\$\$(pwd)/package/${WIDGET_ENTRY_POINT} --port=1234 --tracereq=common --token=\"1\" --verbose")
+set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
+
+
+
+# Optional dependencies order
+# ---------------------------
+#set(EXTRA_DEPENDENCIES_ORDER)
+
+# Optional Extra global include path
+# -----------------------------------
+#set(EXTRA_INCLUDE_DIRS)
+
+# Optional extra libraries
+# -------------------------
+#set(EXTRA_LINK_LIBRARIES)
+
+# Optional force binding installation
+# ------------------------------------
+# set(BINDINGS_INSTALL_PREFIX PrefixPath )
+
+# Optional force binding Linking flag
+# ------------------------------------
+# set(BINDINGS_LINK_FLAG LinkOptions )
+
+# Optional force package prefix generation, like widget
+# -----------------------------------------------------
+# set(PKG_PREFIX DestinationPath)
+
+# Optional Application Framework security token
+# and port use for remote debugging.
+#------------------------------------------------------------
+#set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
+#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
+
+# This include is mandatory and MUST happens at the end
+# of this file, else you expose you to unexpected behavior
+# -----------------------------------------------------------
+include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
new file mode 100644
index 0000000..3fccb70
--- /dev/null
+++ b/conf.d/wgt/config.xml.in
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
+	<name>@PROJECT_NAME@</name>
+	<icon src="@PROJECT_ICON@"/>
+	<content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
+	<description>@PROJECT_DESCRIPTION@</description>
+	<author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
+	<license>@PROJECT_LICENSE@</license>
+
+	<feature name="urn:AGL:widget:required-permission">
+        <param name="urn:AGL:permission::public:hidden" value="required" />
+        <param name="urn:AGL:permission::system:run-by-default" value="required" />
+        <param name="http://tizen.org/privilege/internal/dbus" value="required" />
+	</feature>
+
+    <feature name="urn:AGL:widget:provided-api">
+        <param name="wifi-manager" value="ws" />
+    </feature>
+
+    <feature name="urn:AGL:widget:required-api">
+         <param name="@WIDGET_ENTRY_POINT@" value="local" />
+    </feature>
+
+</widget>
diff --git a/package/config.xml b/package/config.xml
deleted file mode 100644
index 180efa5..0000000
--- a/package/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="agl-service-wifi" version="1.0">
-  <name>agl-service-wifi</name>
-  <icon src="icon.svg"/>
-  <content src="config.xml" type="application/vnd.agl.service"/>
-  <description>WiFi binding service</description>
-  <author>Tasuku Suzuki &lt;tasuku.suzuki@qt.io&gt;</author>
-  <license>APL2.0</license>
-  <feature name="urn:AGL:widget:required-permission">
-    <param name="urn:AGL:permission::public:hidden" value="required" />
-    <param name="urn:AGL:permission::system:run-by-default" value="required" />
-    <param name="http://tizen.org/privilege/internal/dbus" value="required" />
-  </feature>
-  <feature name="urn:AGL:widget:provided-api">
-     <param name="wifi-manager" value="ws" />
-  </feature>
-  <feature name="urn:AGL:widget:required-api">
-     <param name="lib/libagl-wifi-binding.so" value="local" />
-  </feature>
-</widget>
diff --git a/package/icon.svg b/package/icon.svg
deleted file mode 100644
index 6628784..0000000
--- a/package/icon.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:i="&amp;ns_ai;"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 320 320"
-   style="enable-background:new 0 0 320 320;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="icon.svg"><metadata
-     id="metadata1292"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs1290" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1464"
-     id="namedview1288"
-     showgrid="false"
-     inkscape:zoom="0.7375"
-     inkscape:cx="-697.62712"
-     inkscape:cy="160"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4">
-	.st0{display:none;}
-	.st1{display:inline;}
-	.st2{opacity:0.4;fill:url(#SVGID_1_);}
-	.st3{fill:url(#SVGID_2_);}
-	.st4{fill:#FFFFFF;}
-	.st5{font-family:'Roboto-Regular';}
-	.st6{font-size:25px;}
-	.st7{letter-spacing:6;}
-	.st8{fill:url(#SVGID_3_);}
-	.st9{fill:url(#SVGID_4_);}
-	.st10{fill:url(#SVGID_5_);}
-	.st11{fill:url(#SVGID_6_);}
-	.st12{fill:url(#SVGID_7_);}
-	.st13{fill:url(#SVGID_8_);}
-	.st14{fill:url(#SVGID_9_);}
-	.st15{fill:url(#SVGID_10_);}
-	.st16{fill:url(#SVGID_11_);}
-	.st17{fill:url(#SVGID_12_);}
-	.st18{fill:url(#SVGID_13_);}
-	.st19{fill:url(#SVGID_14_);}
-	.st20{fill:url(#SVGID_15_);}
-	.st21{fill:url(#SVGID_16_);}
-	.st22{fill:url(#SVGID_17_);}
-	.st23{fill:url(#SVGID_18_);}
-	.st24{opacity:0.29;}
-	.st25{fill:url(#SVGID_19_);}
-	.st26{fill:url(#SVGID_20_);}
-	.st27{fill:url(#SVGID_21_);}
-	.st28{fill:url(#SVGID_22_);}
-	.st29{fill:url(#SVGID_23_);}
-	.st30{fill:url(#SVGID_24_);}
-	.st31{fill:url(#SVGID_25_);}
-	.st32{fill:url(#SVGID_26_);}
-	.st33{fill:url(#SVGID_27_);}
-	.st34{fill:url(#SVGID_28_);}
-	.st35{fill:url(#SVGID_29_);}
-	.st36{fill:url(#SVGID_30_);}
-	.st37{fill:url(#SVGID_31_);}
-	.st38{fill:url(#SVGID_32_);}
-	.st39{fill:url(#SVGID_33_);}
-	.st40{fill:url(#SVGID_34_);}
-	.st41{fill:url(#SVGID_35_);}
-	.st42{fill:url(#SVGID_36_);}
-	.st43{opacity:0.4;fill:url(#SVGID_37_);}
-	.st44{fill:url(#SVGID_38_);}
-	.st45{fill:url(#SVGID_39_);}
-	.st46{fill:url(#SVGID_40_);}
-	.st47{fill:url(#SVGID_41_);}
-	.st48{fill:url(#SVGID_42_);}
-	.st49{fill:url(#SVGID_43_);}
-	.st50{fill:url(#SVGID_44_);}
-	.st51{display:inline;opacity:0.29;}
-	.st52{display:inline;fill:url(#SVGID_45_);}
-	.st53{display:inline;fill:url(#SVGID_46_);}
-	.st54{display:inline;fill:#FFFFFF;}
-	.st55{display:inline;fill:url(#SVGID_47_);}
-	.st56{display:inline;fill:url(#SVGID_48_);}
-	.st57{display:inline;fill:url(#SVGID_49_);}
-	.st58{display:inline;fill:url(#SVGID_50_);}
-	.st59{display:inline;fill:url(#SVGID_51_);}
-	.st60{display:inline;fill:url(#SVGID_52_);}
-	.st61{opacity:0.4;fill:url(#SVGID_53_);}
-	.st62{fill:url(#SVGID_54_);}
-	.st63{fill:url(#SVGID_55_);}
-	.st64{fill:url(#SVGID_56_);}
-	.st65{fill:url(#SVGID_57_);}
-	.st66{fill:url(#SVGID_58_);}
-	.st67{opacity:0.4;fill:url(#SVGID_59_);}
-	.st68{fill:url(#SVGID_60_);}
-	.st69{fill:url(#SVGID_61_);}
-	.st70{fill:url(#SVGID_62_);}
-	.st71{fill:url(#SVGID_63_);}
-	.st72{fill:url(#SVGID_64_);}
-	.st73{fill:url(#SVGID_65_);}
-	.st74{fill:url(#SVGID_66_);}
-	.st75{fill:url(#SVGID_67_);}
-	.st76{fill:url(#SVGID_68_);}
-	.st77{fill:url(#SVGID_69_);}
-	.st78{fill:url(#SVGID_70_);}
-	.st79{fill:url(#SVGID_71_);}
-	.st80{fill:url(#SVGID_72_);}
-	.st81{fill:url(#SVGID_73_);}
-	.st82{fill:url(#SVGID_74_);}
-	.st83{fill:url(#SVGID_75_);}
-	.st84{fill:url(#SVGID_76_);}
-	.st85{fill:url(#SVGID_77_);}
-	.st86{fill:url(#SVGID_78_);}
-	.st87{fill:url(#SVGID_79_);}
-	.st88{fill:url(#SVGID_80_);}
-	.st89{fill:url(#SVGID_81_);}
-	.st90{fill:url(#SVGID_82_);}
-	.st91{fill:url(#SVGID_83_);}
-	.st92{fill:url(#SVGID_84_);}
-	.st93{fill:url(#SVGID_85_);}
-	.st94{fill:url(#SVGID_86_);}
-	.st95{opacity:0.4;fill:url(#SVGID_87_);}
-	.st96{fill:url(#SVGID_88_);}
-	.st97{fill:url(#SVGID_89_);}
-	.st98{fill:url(#SVGID_90_);}
-	.st99{display:inline;fill:url(#SVGID_91_);}
-	.st100{display:inline;fill:url(#SVGID_92_);}
-	.st101{fill:url(#SVGID_93_);}
-	.st102{fill:url(#SVGID_94_);}
-	.st103{opacity:0.4;fill:url(#SVGID_95_);}
-	.st104{fill:url(#SVGID_96_);}
-	.st105{fill:url(#SVGID_97_);}
-	.st106{fill:url(#SVGID_98_);}
-	.st107{fill:url(#SVGID_99_);}
-	.st108{fill:url(#SVGID_100_);}
-	.st109{fill:url(#SVGID_101_);}
-	.st110{display:inline;fill:url(#SVGID_102_);}
-	.st111{display:inline;fill:url(#SVGID_103_);}
-	.st112{fill:url(#SVGID_104_);}
-	.st113{fill:url(#SVGID_105_);}
-	.st114{fill:url(#SVGID_106_);}
-	.st115{fill:url(#SVGID_107_);}
-	.st116{fill:url(#SVGID_108_);}
-	.st117{opacity:0.4;fill:url(#SVGID_109_);}
-	.st118{fill:url(#SVGID_110_);}
-	.st119{fill:url(#SVGID_111_);}
-	.st120{fill:url(#SVGID_112_);}
-	.st121{fill:url(#SVGID_113_);}
-	.st122{fill:url(#SVGID_114_);}
-	.st123{opacity:0.4;fill:url(#SVGID_115_);}
-	.st124{fill:url(#SVGID_116_);}
-	.st125{fill:url(#SVGID_117_);}
-	.st126{fill:url(#SVGID_118_);}
-	.st127{fill:url(#SVGID_119_);}
-	.st128{fill:url(#SVGID_120_);}
-	.st129{fill:url(#SVGID_121_);}
-	.st130{fill:url(#SVGID_122_);}
-</style><switch
-     id="switch6"><g
-       i:extraneous="self"
-       id="g8"><g
-         id="Settings_Active"><circle
-           class="st24"
-           cx="159.7"
-           cy="133.4"
-           r="101.9"
-           id="circle1230" /><linearGradient
-           id="SVGID_119_"
-           gradientUnits="userSpaceOnUse"
-           x1="115.9317"
-           y1="254.1836"
-           x2="256.3852"
-           y2="-133.5267"><stop
-             offset="0"
-             style="stop-color:#8BC53F"
-             id="stop1233" /><stop
-             offset="2.015080e-02"
-             style="stop-color:#7CCB56;stop-opacity:0.9678"
-             id="stop1235" /><stop
-             offset="6.089833e-02"
-             style="stop-color:#62D67D;stop-opacity:0.9028"
-             id="stop1237" /><stop
-             offset="0.1057"
-             style="stop-color:#4BDFA0;stop-opacity:0.8312"
-             id="stop1239" /><stop
-             offset="0.1543"
-             style="stop-color:#38E7BE;stop-opacity:0.7537"
-             id="stop1241" /><stop
-             offset="0.2077"
-             style="stop-color:#28EED6;stop-opacity:0.6684"
-             id="stop1243" /><stop
-             offset="0.2681"
-             style="stop-color:#1CF3E8;stop-opacity:0.572"
-             id="stop1245" /><stop
-             offset="0.3394"
-             style="stop-color:#13F6F5;stop-opacity:0.4581"
-             id="stop1247" /><stop
-             offset="0.4323"
-             style="stop-color:#0EF8FD;stop-opacity:0.3098"
-             id="stop1249" /><stop
-             offset="0.6264"
-             style="stop-color:#0DF9FF;stop-opacity:0"
-             id="stop1251" /></linearGradient><circle
-           class="st127"
-           cx="159.7"
-           cy="133.4"
-           r="101.9"
-           id="circle1253" /><linearGradient
-           id="SVGID_120_"
-           gradientUnits="userSpaceOnUse"
-           x1="4.0481"
-           y1="287.9492"
-           x2="320.4859"
-           y2="-15.4029"
-           gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
-             offset="0"
-             style="stop-color:#59FF7F"
-             id="stop1256" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop1258" /></linearGradient><path
-           class="st128"
-           d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5     c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2     c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9     c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
-           id="path1260" /><g
-           id="g1262"><text
-             transform="matrix(1 0 0 1 75.4379 284.7129)"
-             class="st4 st5 st6 st7"
-             id="text1264">SETTINGS</text>
-<g
-             id="g1266"><g
-               id="g1268"><g
-                 id="g1270"><linearGradient
-                   id="SVGID_121_"
-                   gradientUnits="userSpaceOnUse"
-                   x1="79.1804"
-                   y1="226.0817"
-                   x2="282.752"
-                   y2="-4.8609"><stop
-                     offset="0"
-                     style="stop-color:#59FF7F"
-                     id="stop1273" /><stop
-                     offset="1"
-                     style="stop-color:#6BFBFF"
-                     id="stop1275" /></linearGradient><path
-                   class="st129"
-                   d="M159.9,163.9c-16.3,0-29.5-13.2-29.5-29.4s13.2-29.4,29.5-29.4v3.9c-14.1,0-25.5,11.4-25.5,25.5         c0,14,11.5,25.5,25.5,25.5c14.1,0,25.6-11.4,25.6-25.5h3.9C189.4,150.7,176.2,163.9,159.9,163.9z"
-                   id="path1277" /></g><g
-                 id="g1279"><linearGradient
-                   id="SVGID_122_"
-                   gradientUnits="userSpaceOnUse"
-                   x1="79.2457"
-                   y1="226.1393"
-                   x2="282.8174"
-                   y2="-4.8033"><stop
-                     offset="0"
-                     style="stop-color:#59FF7F"
-                     id="stop1282" /><stop
-                     offset="1"
-                     style="stop-color:#6BFBFF"
-                     id="stop1284" /></linearGradient><path
-                   class="st130"
-                   d="M171.7,197.4h-23.4c-2.2,0-4-1.8-4-3.9V181c-2-0.7-4-1.5-6-2.5l-8.8,8.8c-1.5,1.5-4,1.5-5.6-0.1         l-16.6-16.6c-1.6-1.6-1.6-4.1-0.1-5.6l8.7-8.7c-1-2-1.8-4-2.5-6.1h-12.3c-2.2,0-3.9-1.8-3.9-4v-23.4c0-2.2,1.8-4,3.9-4h12.3         c0.9-2.6,1.9-5.1,3.2-7.4l3.5,1.8c-1.4,2.6-2.5,5.3-3.4,8.1l-0.4,1.4h-15.2l0,23.5l15.2,0.1l0.4,1.4c0.9,2.8,2,5.5,3.4,8         l0.7,1.3L110,167.8l16.6,16.6l10.9-10.8l1.3,0.7c2.6,1.4,5.2,2.5,8,3.3l1.4,0.4v15.4l23.5,0l0.1-15.4l1.4-0.4         c2.7-0.8,5.4-1.9,7.9-3.3l1.3-0.7l10.9,10.9l16.6-16.6l-10.8-11l0.7-1.3c1.4-2.6,2.5-5.2,3.3-7.9l0.4-1.4h15.4l0-23.5         l-15.3-0.1l-0.4-1.4c-0.8-2.8-1.9-5.5-3.3-8l-0.7-1.3l10.8-10.8l-16.6-16.6l-10.8,10.7l-1.3-0.7c-2.6-1.4-5.3-2.5-8.1-3.4         l-1.4-0.4V75.6l-23.5,0l-0.1,15.1l-1.4,0.4c-2.8,0.9-5.6,2-8.1,3.4l-1.3,0.7l-10.7-10.7L107.2,104c-1.5-1.5-1.5-4,0.1-5.6         l16.5-16.5c0.8-0.8,1.8-1.3,2.9-1.2c1,0,2,0.4,2.7,1.1l8.7,8.6c2-1,4-1.8,6.2-2.5V75.6c0-2.2,1.8-3.9,4-3.9h23.4         c2.2,0,4,1.8,4,3.9v12.3c2.1,0.7,4.1,1.6,6.1,2.5l8.7-8.7c0.7-0.7,1.7-1.1,2.7-1.1h0c1.1,0,2.1,0.4,2.9,1.2l16.6,16.6         c0.8,0.8,1.2,1.8,1.2,2.9c0,1-0.4,2-1.1,2.7l-8.8,8.8c1,2,1.8,4,2.5,6h12.4c2.2,0,3.9,1.8,3.9,4v23.4c0,2.2-1.8,4-3.9,4         h-12.5c-0.7,2-1.5,4-2.5,6l8.9,8.9c1.5,1.5,1.5,4-0.1,5.6l-16.6,16.6c-0.8,0.8-1.8,1.2-2.9,1.2h0c-1,0-2-0.4-2.7-1.1         l-8.9-8.9c-1.9,1-3.9,1.8-5.9,2.5v12.5C175.7,195.6,173.9,197.4,171.7,197.4z"
-                   id="path1286" /></g></g></g></g></g></g></switch></svg>
-\ No newline at end of file
diff --git a/package/package.pro b/package/package.pro
deleted file mode 100644
index 923bbee..0000000
--- a/package/package.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-
-DISTFILES = icon.svg config.xml
-
-!equals($$_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_icon.target = $$OUT_PWD/root/icon.svg
-    copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg
-    copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_icon
-    PRE_TARGETDEPS += $$copy_icon.target
-
-    copy_config.target = $$OUT_PWD/root/config.xml
-    copy_config.depends = $$_PRO_FILE_PWD_/config.xml
-    copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_config
-    PRE_TARGETDEPS += $$copy_config.target
-}
-
-wgt.target = package
-wgt.commands = wgtpkg-pack -f -o agl-service-wifi.wgt root
-
-QMAKE_EXTRA_TARGETS += wgt
author	Matt Ranostay <matt.ranostay@konsulko.com>	2017-08-11 12:31:35 -0700
committer	Matt Ranostay <matt.ranostay@konsulko.com>	2017-08-11 18:48:55 -0700
commit	af8fd545eee24fb2d6a8d472912f9c606b044278 (patch)
tree	4e136a2b7a9524a53af669d76883f9a03b83c9e7
parent	90891cc99c6be8002302e5b68e205cb43df91636 (diff)