Merge lp:~unity-api-team/indicator-network/connectivity-service-bindings into lp:indicator-network/14.10

[Antti Kaijanmäki]

Connectivity Service Qt and QML bindings.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/158/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/159/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

This branch has a bug which is not in trunk. I don't know at which point it was introduced but let's fix it here. In wwan-section.cpp there is this:

m_items.erase(iter);
--iter;

Erase invalidates the iterator it points to so this is undefined behaviour. What is probably meant here is this:

iter = m_items.erase(iter);
--iter;

One more thing in inline comments.

review: Needs Fixing

[Antti Kaijanmäki (kaijanmaki)]

Will leave the q-pointer as is.

[Antti Kaijanmäki (kaijanmaki)]

> This branch has a bug which is not in trunk. I don't know at which point it
> was introduced but let's fix it here. In wwan-section.cpp there is this:
>
> m_items.erase(iter);
> --iter;
>
> Erase invalidates the iterator it points to so this is undefined behaviour.
> What is probably meant here is this:
>
> iter = m_items.erase(iter);
> --iter;

Good catch! Fix is on it's way.

[Jussi Pakkanen (jpakkane)]

Ok.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/160/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

Merged cleanups from jussi.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-03-25 23:22:16 +0000
+++ .bzrignore	2014-08-15 11:57:07 +0000
@@ -1,3 +1,10 @@
 *.autosave
-CMakeLists.txt.user
-CMakeLists.txt.user.3.0-pre1
+CMakeLists.txt.user*
+*~
+/.cproject
+/.project
+/.pydevproject
+/.settings
+/build
+/buildclang
+
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-15 11:57:07 +0000
+++ CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -4,8 +4,8 @@
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
 find_package(PkgConfig REQUIRED)
+include(EnableCoverageReport)
 include(GNUInstallDirs)
-include(Coverage)
 include(UseGSettings)
 
 set(GETTEXT_PACKAGE indicator-network)
@@ -82,28 +82,49 @@
 pkg_check_modules(GIO REQUIRED gio-2.0>=${GLIB_REQUIRED_VERSION})
 include_directories(${GIO_INCLUDE_DIRS})
 
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 find_package(GObjectIntrospection 0.9.12)
 
 include_directories(${CMAKE_BINARY_DIR})
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(COMMON_FLAGS "-Wall -Wextra -Wpedantic -fno-permissive")
+string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
+if(NOT BUILD_TYPE MATCHES debug)
+    set(COMMON_FLAGS "${COMMON_FLAGS} -Werror")
+endif()
 
-add_definitions(
-    -Wall
-    -Wextra
-    -Wpedantic
-)
+# "nice bug" in cmake... http://www.cmake.org/Bug/view.php?id=15058
+# let's not set C_FLAGS as it will break pthreads detection \o/
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${COMMON_FLAGS}")
 
 configure_file(
   "config.h.in"
   "config.h"
 )
 
+#####################################################################
+# Enable code coverage calculation with gcov/gcovr/lcov
+# Usage:
+#  * Switch build type to coverage (use ccmake or cmake-gui)
+#  * Invoke make, make test, make coverage
+#  * Find html report in subdir coveragereport
+#  * Find xml report feasible for jenkins in coverage.xml
+#####################################################################
+IF(BUILD_TYPE MATCHES coverage)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
+ENDIF()
+
+
+set(CONNECTIVITY_QT_VERSION_MAJOR 1)
+set(CONNECTIVITY_QT_VERSION_MINOR 0)
+set(CONNECTIVITY_QT_LIB_TARGET connectivity-qt${CONNECTIVITY_QT_VERSION_MAJOR})
 add_subdirectory(data)
+#add_subdirectory(doc)
 add_subdirectory(src)
 add_subdirectory(po)
 
@@ -115,3 +136,5 @@
         ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
 )
 
+enable_coverage_report(TARGETS connectivity-qt1 menumodel_cpp indicator-secret-agent
+                       FILTER ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
 
=== removed file 'cmake/Coverage.cmake'
--- cmake/Coverage.cmake	2013-08-27 13:48:41 +0000
+++ cmake/Coverage.cmake	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-if (CMAKE_BUILD_TYPE MATCHES coverage)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
-
-  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
-  if (NOT GCOVR_EXECUTABLE)
-    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
-  else ()
-    message(STATUS "Gcovr found, can generate XML coverage info.")
-    add_custom_target (coverage-xml
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" --exclude="obj.*" -x -r "${CMAKE_SOURCE_DIR}" 
-      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
-  endif()
-
-  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
-  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
-  if (NOT LCOV_EXECUTABLE)
-    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
-  else ()
-    if(NOT GENHTML_EXECUTABLE)
-      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
-    else()
-      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
-      add_custom_target (coverage-html
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND "${LCOV_EXECUTABLE}" --capture --output-file "${CMAKE_BINARY_DIR}/coverage.info" --no-checksum --directory "${CMAKE_BINARY_DIR}"
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '/usr/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_BINARY_DIR}/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_SOURCE_DIR}/tests/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info" 
-        COMMAND "${GENHTML_EXECUTABLE}" --prefix "${CMAKE_BINARY_DIR}" --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-        )
-    endif()
-  endif()
-endif()
 
=== added file 'cmake/EnableCoverageReport.cmake'
--- cmake/EnableCoverageReport.cmake	1970-01-01 00:00:00 +0000
+++ cmake/EnableCoverageReport.cmake	2014-08-15 11:57:07 +0000
@@ -0,0 +1,153 @@
+# - Creates a special coverage build type and target on GCC.
+#
+# Defines a function ENABLE_COVERAGE_REPORT which generates the coverage target
+# for selected targets. Optional arguments to this function are used to filter
+# unwanted results using globbing expressions. Moreover targets with tests for
+# the source code can be specified to trigger regenerating the report if the
+# test has changed
+#
+# ENABLE_COVERAGE_REPORT(TARGETS target... [FILTER filter...] [TESTS test targets...])
+#
+# To generate a coverage report first build the project with
+# CMAKE_BUILD_TYPE=coverage, then call make test and afterwards make coverage.
+#
+# The coverage report is based on gcov. Depending on the availability of lcov
+# a HTML report will be generated and/or an XML report of gcovr is found.
+# The generated coverage target executes all found solutions. Special targets
+# exist to create e.g. only the xml report: coverage-xml. 
+#
+# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+INCLUDE(ParseArguments)
+
+FIND_PACKAGE(Lcov)
+FIND_PACKAGE(gcovr)
+
+FUNCTION(ENABLE_COVERAGE_REPORT)
+    
+    # argument parsing
+    PARSE_ARGUMENTS(ARG "FILTER;TARGETS;TESTS" "" ${ARGN})
+    
+    SET(COVERAGE_RAW_FILE "${CMAKE_BINARY_DIR}/coverage.raw.info")
+    SET(COVERAGE_FILTERED_FILE "${CMAKE_BINARY_DIR}/coverage.info")
+    SET(COVERAGE_REPORT_DIR "${CMAKE_BINARY_DIR}/coveragereport")
+    SET(COVERAGE_XML_FILE "${CMAKE_BINARY_DIR}/coverage.xml")
+    SET(COVERAGE_XML_COMMAND_FILE "${CMAKE_BINARY_DIR}/coverage-xml.cmake")
+    
+    # decide if there is any tool to create coverage data
+    SET(TOOL_FOUND FALSE)
+    IF(LCOV_FOUND OR GCOVR_FOUND)
+        SET(TOOL_FOUND TRUE)
+    ENDIF()
+    IF(NOT TOOL_FOUND)
+        MESSAGE(STATUS "Cannot enable coverage targets because neither lcov nor gcovr are found.")
+    ENDIF()
+    
+    STRING(TOLOWER "${CMAKE_BUILD_TYPE}" COVERAGE_BUILD_TYPE)
+    IF(CMAKE_COMPILER_IS_GNUCXX AND TOOL_FOUND AND "${COVERAGE_BUILD_TYPE}" MATCHES "coverage")
+    
+        MESSAGE(STATUS "Coverage support enabled for targets: ${ARG_TARGETS}")
+    
+        # create coverage build type
+        SET(CMAKE_CXX_FLAGS_COVERAGE ${CMAKE_CXX_FLAGS_DEBUG} PARENT_SCOPE)
+        SET(CMAKE_C_FLAGS_COVERAGE ${CMAKE_C_FLAGS_DEBUG} PARENT_SCOPE)
+        SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} coverage PARENT_SCOPE)
+    
+        # instrument targets
+        SET_TARGET_PROPERTIES(${ARG_TARGETS} PROPERTIES COMPILE_FLAGS --coverage
+                                                        LINK_FLAGS --coverage)
+    
+        # html report
+        IF (LCOV_FOUND)
+        
+            MESSAGE(STATUS "Enabling HTML coverage report")
+    
+            # set up coverage target
+            
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_RAW_FILE}
+                               COMMAND ${LCOV_EXECUTABLE} -c -d ${CMAKE_BINARY_DIR} -o ${COVERAGE_RAW_FILE}
+                               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                               COMMENT "Collecting coverage data"
+                               DEPENDS ${ARG_TARGETS} ${ARG_TESTS}
+                               VERBATIM)
+            
+            # filter unwanted stuff
+            LIST(LENGTH ARG_FILTER FILTER_LENGTH)
+            IF(${FILTER_LENGTH} GREATER 0)
+                SET(FILTER COMMAND ${LCOV_EXECUTABLE})
+                FOREACH(F ${ARG_FILTER})
+                    SET(FILTER ${FILTER} -r ${COVERAGE_FILTERED_FILE} ${F})
+                ENDFOREACH()
+                SET(FILTER ${FILTER} -o ${COVERAGE_FILTERED_FILE})
+            ELSE()
+                SET(FILTER "")
+            ENDIF()
+            
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_FILTERED_FILE}
+                               COMMAND ${LCOV_EXECUTABLE} -e ${COVERAGE_RAW_FILE} "${CMAKE_SOURCE_DIR}*"  -o ${COVERAGE_FILTERED_FILE}
+                               ${FILTER}
+                               DEPENDS ${COVERAGE_RAW_FILE}
+                               COMMENT "Filtering recorded coverage data for project-relevant entries"
+                               VERBATIM)
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_REPORT_DIR}
+                               COMMAND ${CMAKE_COMMAND} -E make_directory ${COVERAGE_REPORT_DIR}
+                               COMMAND ${GENHTML_EXECUTABLE} --legend --show-details -t "${PROJECT_NAME} test coverage" -o ${COVERAGE_REPORT_DIR} ${COVERAGE_FILTERED_FILE}
+                               DEPENDS ${COVERAGE_FILTERED_FILE}
+                               COMMENT "Generating HTML coverage report in ${COVERAGE_REPORT_DIR}"
+                               VERBATIM)
+                               
+            ADD_CUSTOM_TARGET(coverage-html
+                              DEPENDS ${COVERAGE_REPORT_DIR})
+                              
+        ENDIF()
+        
+        # xml coverage report
+        IF(GCOVR_FOUND)
+        
+            MESSAGE(STATUS "Enabling XML coverage report")
+        
+            # gcovr cannot write directly to a file so the execution needs to
+            # be wrapped in a cmake file that generates the file output
+            FILE(WRITE ${COVERAGE_XML_COMMAND_FILE}
+                 "SET(ENV{LANG} en)\n")
+            FILE(APPEND ${COVERAGE_XML_COMMAND_FILE}
+                "EXECUTE_PROCESS(COMMAND \"${GCOVR_EXECUTABLE}\" --exclude=tests.* --exclude=obj-.* --exclude=cmake.* -x -r \"${CMAKE_SOURCE_DIR}\" OUTPUT_FILE \"${COVERAGE_XML_FILE}\" WORKING_DIRECTORY \"${CMAKE_BINARY_DIR}\")\n")
+        
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_XML_FILE}
+                               COMMAND ${CMAKE_COMMAND} ARGS -P ${COVERAGE_XML_COMMAND_FILE}
+                               COMMENT "Generating coverage XML report"
+                               VERBATIM)
+                               
+            ADD_CUSTOM_TARGET(coverage-xml
+                              DEPENDS ${COVERAGE_XML_FILE})
+        
+        ENDIF()
+        
+        # provide a global coverage target executing both steps if available
+        SET(GLOBAL_DEPENDS "")
+        IF(LCOV_FOUND)
+            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_REPORT_DIR})
+        ENDIF()
+        IF(GCOVR_FOUND)
+            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_XML_FILE})
+        ENDIF()
+        IF(LCOV_FOUND OR GCOVR_FOUND)
+            ADD_CUSTOM_TARGET(coverage
+                              DEPENDS ${GLOBAL_DEPENDS})
+        ENDIF()
+                          
+    ENDIF()
+
+ENDFUNCTION()   
 
=== added file 'cmake/FindLcov.cmake'
--- cmake/FindLcov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindLcov.cmake	2014-08-15 11:57:07 +0000
@@ -0,0 +1,29 @@
+# - Find lcov 
+# Will define:
+#
+# LCOV_EXECUTABLE - the lcov binary
+# GENHTML_EXECUTABLE - the genhtml executable
+#
+# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PROGRAM(LCOV_EXECUTABLE lcov)
+FIND_PROGRAM(GENHTML_EXECUTABLE genhtml)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lcov DEFAULT_MSG LCOV_EXECUTABLE GENHTML_EXECUTABLE)
+
+# only visible in advanced view
+MARK_AS_ADVANCED(LCOV_EXECUTABLE GENHTML_EXECUTABLE)
 
=== added file 'cmake/Findgcovr.cmake'
--- cmake/Findgcovr.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Findgcovr.cmake	2014-08-15 11:57:07 +0000
@@ -0,0 +1,31 @@
+# - Find gcovr scrip 
+# Will define:
+#
+# GCOVR_EXECUTABLE - the gcovr script
+#
+# Uses:
+#
+# GCOVR_ROOT - root to search for the script
+#
+# Copyright (C) 2011 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PROGRAM(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gcovr DEFAULT_MSG GCOVR_EXECUTABLE)
+
+# only visible in advanced view
+MARK_AS_ADVANCED(GCOVR_EXECUTABLE)
 
=== added file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ParseArguments.cmake	2014-08-15 11:57:07 +0000
@@ -0,0 +1,52 @@
+# Parse arguments passed to a function into several lists separated by
+# upper-case identifiers and options that do not have an associated list e.g.:
+#
+# SET(arguments
+#   hello OPTION3 world
+#   LIST3 foo bar
+#   OPTION2
+#   LIST1 fuz baz
+#   )
+# PARSE_ARGUMENTS(ARG "LIST1;LIST2;LIST3" "OPTION1;OPTION2;OPTION3" ${arguments})
+#
+# results in 7 distinct variables:
+#  * ARG_DEFAULT_ARGS: hello;world
+#  * ARG_LIST1: fuz;baz
+#  * ARG_LIST2:
+#  * ARG_LIST3: foo;bar
+#  * ARG_OPTION1: FALSE
+#  * ARG_OPTION2: TRUE
+#  * ARG_OPTION3: TRUE
+#
+# taken from http://www.cmake.org/Wiki/CMakeMacroParseArguments 
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+    SET(DEFAULT_ARGS)
+    FOREACH(arg_name ${arg_names})    
+        SET(${prefix}_${arg_name})
+    ENDFOREACH(arg_name)
+    FOREACH(option ${option_names})
+        SET(${prefix}_${option} FALSE)
+    ENDFOREACH(option)
+    
+    SET(current_arg_name DEFAULT_ARGS)
+    SET(current_arg_list)
+    FOREACH(arg ${ARGN})            
+        SET(larg_names ${arg_names})    
+        LIST(FIND larg_names "${arg}" is_arg_name)                   
+        IF (is_arg_name GREATER -1)
+            SET(${prefix}_${current_arg_name} ${current_arg_list})
+            SET(current_arg_name ${arg})
+            SET(current_arg_list)
+        ELSE (is_arg_name GREATER -1)
+            SET(loption_names ${option_names})    
+            LIST(FIND loption_names "${arg}" is_option)            
+            IF (is_option GREATER -1)
+                SET(${prefix}_${arg} TRUE)
+            ELSE (is_option GREATER -1)
+                SET(current_arg_list ${current_arg_list} ${arg})
+            ENDIF (is_option GREATER -1)
+        ENDIF (is_arg_name GREATER -1)
+    ENDFOREACH(arg)
+    SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
 
=== added file 'debian/connectivity-doc.install'
--- debian/connectivity-doc.install	1970-01-01 00:00:00 +0000
+++ debian/connectivity-doc.install	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/libconnectivity/*
 
=== modified file 'debian/control'
--- debian/control	2014-08-06 12:22:27 +0000
+++ debian/control	2014-08-15 11:57:07 +0000
@@ -9,6 +9,7 @@
                g++-4.9,
                debhelper (>= 9.0.0),
                google-mock (>= 1.6.0+svn437),
+               dbus-test-runner,
                libconnectivity-cpp-dev (>=0.0.1+14.10.20140709),
                libdbus-cpp-dev (>= 4.0.0),
                libglib2.0-dev,
@@ -24,7 +25,13 @@
                pkg-config,
                python3-dbusmock,
                python3-setuptools,
+               qt5-default,
                qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin,
                valgrind [amd64 armhf i386 powerpc],
 Standards-Version: 3.9.3
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -60,3 +67,49 @@
 Description: Autopilot tests for the network indicator for Ubuntu
  The Indicator-network service is responsible for exporting the system settings
  menu through dbus.  This package contains its autopilot tests.
+
+Package: libconnectivity-qt1
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Unity Action Qt API
+ Ubuntu Connectivity API - Qt bindings
+
+Package: libconnectivity-qt1-dev
+Section: libdevel
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libconnectivity-qt1 (= ${binary:Version}),
+         qtbase5-dev
+Suggests: unity-action-doc,
+Description: Unity Action Qt API - development files
+ Ubuntu Connectivity API - Qt bindings
+ .
+ This package contains development files to develop against the Qt library.
+
+Package: qtdeclarative5-connectivity-plugin
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libconnectivity-qt1 (= ${binary:Version}),
+Description: Unity Action QML Components
+ Ubuntu Connectivity API - QML bindings
+ .
+ This package contains the qtdeclarative bindings for Ubuntu connectivity API.
+
+#Package: connectivity-doc
+#Section: doc
+#Architecture: all
+#Depends: ${misc:Depends},
+#         ${shlibs:Depends},
+#Description: Unity Action API - documentation
+# Ubuntu Connectivity API
+# .
+# This package contains developer documentation.
 
=== added file 'debian/libconnectivity-qt1-dev.install'
--- debian/libconnectivity-qt1-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libconnectivity-qt1-dev.install	2014-08-15 11:57:07 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libconnectivity-qt1.so
+usr/include/*
+usr/lib/*/pkgconfig/*
 
=== added file 'debian/libconnectivity-qt1.install'
--- debian/libconnectivity-qt1.install	1970-01-01 00:00:00 +0000
+++ debian/libconnectivity-qt1.install	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libconnectivity-qt1.so.*
 
=== added file 'debian/qtdeclarative5-connectivity-plugin.install'
--- debian/qtdeclarative5-connectivity-plugin.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-connectivity-plugin.install	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-15 11:57:07 +0000
+++ src/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -2,5 +2,6 @@
 add_subdirectory(indicator)
 add_subdirectory(menumodel-cpp)
 add_subdirectory(notify-cpp)
+add_subdirectory(qt)
 add_subdirectory(secret-agent)
 add_subdirectory(url-dispatcher-cpp)
 
=== modified file 'src/dbus-cpp/services/ofono.h'
--- src/dbus-cpp/services/ofono.h	2014-08-05 17:02:58 +0000
+++ src/dbus-cpp/services/ofono.h	2014-08-15 11:57:07 +0000
@@ -198,7 +198,7 @@
         }
 
         typedef std::shared_ptr<NetworkRegistration> Ptr;
-        NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
+        explicit NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
             : object(object),
               propertyChanged(object->get_signal<Signal::PropertyChanged>())
         {
@@ -722,7 +722,7 @@
         }
 
         typedef std::shared_ptr<SimManager> Ptr;
-        SimManager(const std::shared_ptr<core::dbus::Object>& object)
+        explicit SimManager(const std::shared_ptr<core::dbus::Object>& object)
             : object(object),
               propertyChanged(object->get_signal<Signal::PropertyChanged>())
         {
@@ -1296,7 +1296,7 @@
     }
 
 
-    Service(const core::dbus::Bus::Ptr& bus)
+    explicit Service(const core::dbus::Bus::Ptr& bus)
     {
         auto service = core::dbus::Service::use_service<Service>(bus);
         auto object = service->object_for_path(core::dbus::types::ObjectPath(OFONO_MANAGER_PATH));
@@ -1307,7 +1307,7 @@
     {
         std::shared_ptr<Interface::Manager> manager;
 
-        Mock(const core::dbus::Bus::Ptr& bus)
+        explicit Mock(const core::dbus::Bus::Ptr& bus)
         {
             auto service = core::dbus::Service::add_service<Service>(bus);
             auto object = service->add_object_for_path(core::dbus::types::ObjectPath(OFONO_MANAGER_PATH));
 
=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2014-08-15 11:57:07 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2014-08-15 11:57:07 +0000
@@ -32,7 +32,7 @@
 {
     std::ostringstream output;
 
-    output << "<property ";
+    output << "        <property ";
     output << "name=\"" << T::name() << "\" ";
     output << "type=\"" << core::dbus::helper::TypeMapper<typename T::ValueType>::signature() << "\" ";
 
@@ -252,46 +252,48 @@
     std::ostringstream output;
 
     static const std::string header(
-                "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\n"
-                "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
-                "<node>\n"
+                "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
+                "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n");
+
+    static const std::string introspectable_interface(
                 "    <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
                 "        <method name=\"Introspect\">\n"
-                "            <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
+                "            <arg name=\"xml_data\" direction=\"out\" type=\"s\"/>\n"
                 "        </method>\n"
-                "    </interface>\n"
+                "    </interface>\n");
+
+    static const std::string dbus_properties_interface(
                 "    <interface name=\"org.freedesktop.DBus.Properties\">\n"
                 "        <method name=\"Get\">\n"
-                "            <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"
-                "            <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n"
+                "            <arg name=\"interface_name\" direction=\"in\" type=\"s\"/>\n"
+                "            <arg name=\"property_name\" direction=\"in\" type=\"s\"/>\n"
                 "            <arg name=\"value\" direction=\"out\" type=\"v\"/>\n"
                 "        </method>\n"
                 "        <method name=\"Set\">\n"
-                "             <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"
-                "             <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n"
+                "             <arg name=\"interface_name\" direction=\"in\" type=\"s\"/>\n"
+                "             <arg name=\"property_name\" direction=\"in\" type=\"s\"/>\n"
                 "             <arg name=\"value\" direction=\"in\" type=\"v\"/>\n"
                 "        </method>\n"
                 "        <method name=\"GetAll\">\n"
-                "            <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"
+                "            <arg name=\"interface_name\" direction=\"in\" type=\"s\"/>\n"
                 "            <arg name=\"props\" direction=\"out\" type=\"a{sv}\"/>\n"
                 "        </method>\n"
-                "        <signal name=\"PropertiesChanged\"\n>"
+                "        <signal name=\"PropertiesChanged\">\n"
                 "            <arg type=\"s\" name=\"interface_name\"/>\n"
                 "            <arg type=\"a{sv}\" name=\"changed_properties\"/>\n"
                 "            <arg type=\"as\" name=\"invalidated_properties\"/>\n"
-                "            </signal>\n"
+                "        </signal>\n"
                 "    </interface>\n");
 
-    static const std::string footer("</node>\n");
-
     output << header;
-
-    output << "<interface name=\"" << com::ubuntu::connectivity::Interface::NetworkingStatus::name() << "\">\n";
+    output << "<node name=\"" << com::ubuntu::connectivity::Interface::NetworkingStatus::path() << "\">\n";
+    output << introspectable_interface;
+    output << dbus_properties_interface;
+    output << "    <interface name=\"" << com::ubuntu::connectivity::Interface::NetworkingStatus::name() << "\">\n";
     output << generatePropertyIntrospectionXml<com::ubuntu::connectivity::Interface::NetworkingStatus::Property::Limitations>() << std::endl;
     output << generatePropertyIntrospectionXml<com::ubuntu::connectivity::Interface::NetworkingStatus::Property::Status>() << std::endl;
-    output << "</interface>\n";
-
-    output << footer;
+    output << "    </interface>\n";
+    output << "</node>\n";
 
     return output.str();
 }
 
=== modified file 'src/indicator/indicator-menu.h'
--- src/indicator/indicator-menu.h	2014-06-05 14:12:19 +0000
+++ src/indicator/indicator-menu.h	2014-08-15 11:57:07 +0000
@@ -33,6 +33,8 @@
     typedef std::shared_ptr<IndicatorMenu> Ptr;
 
     IndicatorMenu() = delete;
+    virtual ~IndicatorMenu() = default;
+
     IndicatorMenu(RootState::Ptr rootState, const std::string &prefix)
         : m_rootState{rootState},
           m_prefix{prefix}
@@ -60,8 +62,6 @@
         m_rootMenu->append(m_rootItem);
     }
 
-    virtual ~IndicatorMenu() {}
-
     virtual void
     addSection(Section::Ptr section)
     {
 
=== modified file 'src/indicator/indicator-network-service.cpp'
--- src/indicator/indicator-network-service.cpp	2014-08-15 11:57:07 +0000
+++ src/indicator/indicator-network-service.cpp	2014-08-15 11:57:07 +0000
@@ -35,7 +35,7 @@
 {
     GMainLoop *ptr;
 public:
-    MainLoop() { ptr = g_main_loop_new(NULL, FALSE); }
+    MainLoop() { ptr = g_main_loop_new(nullptr, FALSE); }
    ~MainLoop() { g_main_loop_unref(ptr);             }
 
     void run()  { g_main_loop_run(ptr);  }
@@ -89,12 +89,12 @@
     connectivityService->unlockAllModems().connect([menu](){ menu->unlockAllModems(); });
 
     if (getenv("VALGRIND") != 0) {
-        g_timeout_add(1000, (GSourceFunc)stop_main_loop, NULL);
+        g_timeout_add(1000, (GSourceFunc)stop_main_loop, nullptr);
         mainloop.run();
 
         menu.reset();
         // give gio time to do cleanup.
-        g_timeout_add(500, (GSourceFunc)stop_main_loop, NULL);
+        g_timeout_add(500, (GSourceFunc)stop_main_loop, nullptr);
         mainloop.run();
     } else {
         mainloop.run();
 
=== modified file 'src/indicator/menuitems/access-point-item.h'
--- src/indicator/menuitems/access-point-item.h	2014-05-12 18:25:45 +0000
+++ src/indicator/menuitems/access-point-item.h	2014-08-15 11:57:07 +0000
@@ -40,7 +40,7 @@
     typedef std::shared_ptr<AccessPointItem> Ptr;
 
     AccessPointItem() = delete;
-    AccessPointItem(networking::wifi::AccessPoint::Ptr accessPoint, bool isActive = false)
+    explicit AccessPointItem(networking::wifi::AccessPoint::Ptr accessPoint, bool isActive = false)
         : m_accessPoint{accessPoint},
           m_isActive{isActive}
     {
 
=== modified file 'src/indicator/menuitems/switch-item.h'
--- src/indicator/menuitems/switch-item.h	2014-05-27 16:06:14 +0000
+++ src/indicator/menuitems/switch-item.h	2014-08-15 11:57:07 +0000
@@ -31,6 +31,7 @@
     typedef std::shared_ptr<SwitchItem> Ptr;
 
     SwitchItem() = delete;
+    virtual  ~SwitchItem() = default;
     SwitchItem(const std::string &label, const std::string &prefix, const std::string &name)
     {
         m_state.changed().connect([this](bool value){
 
=== modified file 'src/indicator/menuitems/text-item.h'
--- src/indicator/menuitems/text-item.h	2014-05-12 11:36:59 +0000
+++ src/indicator/menuitems/text-item.h	2014-08-15 11:57:07 +0000
@@ -33,6 +33,7 @@
     typedef std::shared_ptr<TextItem> Ptr;
 
     TextItem() = delete;
+    virtual ~TextItem() = default;
     TextItem(const std::string &label, const std::string &prefix, const std::string &name)
     {
         std::string action_name = prefix + "." + name;
 
=== modified file 'src/indicator/modem.h'
--- src/indicator/modem.h	2014-08-15 11:57:07 +0000
+++ src/indicator/modem.h	2014-08-15 11:57:07 +0000
@@ -67,7 +67,7 @@
     };
 
     Modem() = delete;
-    Modem(org::ofono::Interface::Modem::Ptr ofonoModem);
+    explicit Modem(org::ofono::Interface::Modem::Ptr ofonoModem);
     virtual ~Modem();
 
     org::ofono::Interface::Modem::Ptr ofonoModem() const;
 
=== modified file 'src/indicator/root-state.cpp'
--- src/indicator/root-state.cpp	2014-08-15 11:57:07 +0000
+++ src/indicator/root-state.cpp	2014-08-15 11:57:07 +0000
@@ -232,7 +232,7 @@
 Variant
 RootState::Private::createIcon(const std::string name)
 {
-    GError *error = NULL;
+    GError *error = nullptr;
     auto gicon = g_icon_new_for_string(name.c_str(), &error);
     if (error) {
         g_error_free(error);
 
=== modified file 'src/indicator/wifi-link-item.h'
--- src/indicator/wifi-link-item.h	2014-05-27 16:06:14 +0000
+++ src/indicator/wifi-link-item.h	2014-08-15 11:57:07 +0000
@@ -71,6 +71,7 @@
     typedef std::shared_ptr<WifiLinkItem> Ptr;
 
     WifiLinkItem() = delete;
+    virtual ~WifiLinkItem() = default;
     WifiLinkItem(networking::wifi::Link::Ptr link)
         : m_link {link}
     {
 
=== modified file 'src/indicator/wifi-section.h'
--- src/indicator/wifi-section.h	2014-05-12 11:36:59 +0000
+++ src/indicator/wifi-section.h	2014-08-15 11:57:07 +0000
@@ -32,8 +32,8 @@
 public:
     typedef std::shared_ptr<WifiSection> Ptr;
     WifiSection() = delete;
-    WifiSection(std::shared_ptr<connectivity::networking::Manager> manager);
-    ~WifiSection();
+    explicit WifiSection(std::shared_ptr<connectivity::networking::Manager> manager);
+    virtual ~WifiSection();
 
     // from Section
     virtual ActionGroup::Ptr actionGroup();
 
=== modified file 'src/indicator/wwan-link-item.h'
--- src/indicator/wwan-link-item.h	2014-08-07 00:19:35 +0000
+++ src/indicator/wwan-link-item.h	2014-08-15 11:57:07 +0000
@@ -32,7 +32,7 @@
     typedef std::shared_ptr<WwanLinkItem> Ptr;
     WwanLinkItem() = delete;
     WwanLinkItem(Modem::Ptr, ModemManager::Ptr modemManager);
-    ~WwanLinkItem();
+    virtual ~WwanLinkItem();
 
     // from Section
     virtual ActionGroup::Ptr actionGroup();
 
=== modified file 'src/indicator/wwan-section.cpp'
--- src/indicator/wwan-section.cpp	2014-08-15 11:57:07 +0000
+++ src/indicator/wwan-section.cpp	2014-08-15 11:57:07 +0000
@@ -109,7 +109,7 @@
         for (auto iter = m_items.begin(); iter != m_items.end(); ++iter) {
             m_linkMenuMerger->remove(*(*iter).second);
             m_actionGroupMerger->remove(*(*iter).second);
-            m_items.erase(iter);
+            iter = m_items.erase(iter);
             --iter;
         }
     }
 
=== modified file 'src/indicator/wwan-section.h'
--- src/indicator/wwan-section.h	2014-08-15 11:57:07 +0000
+++ src/indicator/wwan-section.h	2014-08-15 11:57:07 +0000
@@ -31,8 +31,8 @@
 public:
     typedef std::shared_ptr<WwanSection> Ptr;
     WwanSection() = delete;
-    WwanSection(ModemManager::Ptr modemManager);
-    ~WwanSection();
+    explicit WwanSection(ModemManager::Ptr modemManager);
+    virtual ~WwanSection();
 
     virtual ActionGroup::Ptr actionGroup();
     virtual MenuModel::Ptr menuModel();
 
=== modified file 'src/menumodel-cpp/action-group-merger.h'
--- src/menumodel-cpp/action-group-merger.h	2014-08-15 11:57:07 +0000
+++ src/menumodel-cpp/action-group-merger.h	2014-08-15 11:57:07 +0000
@@ -96,7 +96,7 @@
 public:
     typedef std::shared_ptr<ActionGroupMerger> Ptr;
 
-    ActionGroupMerger(const std::string &prefix = "")
+    explicit ActionGroupMerger(const std::string &prefix = "")
         : m_prefix {prefix}
     {
         m_actionGroup = std::make_shared<ActionGroup>(m_prefix);
 
=== modified file 'src/menumodel-cpp/gio-helpers/util.h'
--- src/menumodel-cpp/gio-helpers/util.h	2014-05-12 11:36:59 +0000
+++ src/menumodel-cpp/gio-helpers/util.h	2014-08-15 11:57:07 +0000
@@ -56,7 +56,7 @@
             g_idle_add_full(G_PRIORITY_HIGH,
                             GSourceFunc(GMainLoopSync::dispatch_cb),
                             this,
-                            NULL);
+                            nullptr);
             if (m_cv.wait_for(lk, std::chrono::seconds(3)) == std::cv_status::timeout) {
                 std::cerr << "Timeout when waiting for GMainLoop sync." << std::endl;
             }
@@ -143,13 +143,13 @@
 
     SessionBus()
     {
-        GError *error = NULL;
+        GError *error = nullptr;
 
         gchar *address = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SESSION,
-                                                         NULL, &error);
+                                                         nullptr, &error);
         if (!address)
         {
-            g_assert(error != NULL);
+            g_assert(error != nullptr);
             if (error->domain != G_IO_ERROR
                     || error->code != G_IO_ERROR_CANCELLED)
             {
@@ -160,20 +160,20 @@
             return;
         }
 
-        error = NULL;
+        error = nullptr;
         m_bus.reset(
                 g_dbus_connection_new_for_address_sync(
                         address,
                         (GDBusConnectionFlags) (G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT
                                 | G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION),
-                        NULL,
-                        NULL,
+                        nullptr,
+                        nullptr,
                         &error),
                 GObjectDeleter());
         g_free(address);
 
         if (!m_bus) {
-            g_assert(error != NULL);
+            g_assert(error != nullptr);
             if (error->domain != G_IO_ERROR || error->code != G_IO_ERROR_CANCELLED) {
                 std::cerr << "Error getting the bus: " << error->message;
             }
@@ -236,7 +236,7 @@
                                          (GBusNameAcquiredCallback)nameAcquired,
                                          (GBusNameLostCallback)nameLost,
                                          this,
-                                         NULL);
+                                         nullptr);
 
     }
     ~BusName()
 
=== modified file 'src/menumodel-cpp/gio-helpers/variant.h'
--- src/menumodel-cpp/gio-helpers/variant.h	2014-04-24 13:24:05 +0000
+++ src/menumodel-cpp/gio-helpers/variant.h	2014-08-15 11:57:07 +0000
@@ -140,7 +140,7 @@
     {
         assert(variant);
         assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_STRING));
-        value = g_variant_get_string(variant, NULL);
+        value = g_variant_get_string(variant, nullptr);
     }
 };
 
 
=== modified file 'src/menumodel-cpp/menu-item.h'
--- src/menumodel-cpp/menu-item.h	2014-04-02 23:12:55 +0000
+++ src/menumodel-cpp/menu-item.h	2014-08-15 11:57:07 +0000
@@ -64,13 +64,13 @@
         return menu;
     }
 
-    MenuItem(const std::string &label  = "",
+    explicit MenuItem(const std::string &label  = "",
              const std::string &action = "")
         : m_label{label},
           m_action{action}
     {
         /// @todo validate that action is valid
-        m_gmenuitem = make_gmenuitem_ptr(g_menu_item_new(NULL, NULL));
+        m_gmenuitem = make_gmenuitem_ptr(g_menu_item_new(nullptr, nullptr));
         if (!label.empty()) {
             g_menu_item_set_label(m_gmenuitem.get(), label.c_str());
         }
@@ -136,7 +136,7 @@
         assert(!attribute.empty());
         std::lock_guard<std::recursive_mutex> lg(m_mutex);
         m_attributes.erase(attribute);
-        g_menu_item_set_attribute(m_gmenuitem.get(), attribute.c_str(), NULL);
+        g_menu_item_set_attribute(m_gmenuitem.get(), attribute.c_str(), nullptr);
         m_changed();
     }
 
 
=== modified file 'src/notify-cpp/notification.cpp'
--- src/notify-cpp/notification.cpp	2014-03-25 23:22:16 +0000
+++ src/notify-cpp/notification.cpp	2014-08-15 11:57:07 +0000
@@ -57,13 +57,13 @@
     d->disconnectId = g_signal_connect(d->notification.get(), "closed", G_CALLBACK(Private::closed_cb), d.get());
 
     d->summary.changed().connect([this](const std::string &value){
-        g_object_set(d->notification.get(), "summary", value.c_str(), NULL);
+        g_object_set(d->notification.get(), "summary", value.c_str(), nullptr);
     });
     d->body.changed().connect([this](const std::string &value){
-        g_object_set(d->notification.get(), "body", value.c_str(), NULL);
+        g_object_set(d->notification.get(), "body", value.c_str(), nullptr);
     });
     d->icon.changed().connect([this](const std::string &value){
-        g_object_set(d->notification.get(), "icon", value.c_str(), NULL);
+        g_object_set(d->notification.get(), "icon", value.c_str(), nullptr);
     });
 
 }
 
=== modified file 'src/notify-cpp/snapdecision/sim-unlock.h'
--- src/notify-cpp/snapdecision/sim-unlock.h	2014-04-23 13:18:25 +0000
+++ src/notify-cpp/snapdecision/sim-unlock.h	2014-08-15 11:57:07 +0000
@@ -36,7 +36,7 @@
 
     typedef std::shared_ptr<SimUnlock> Ptr;
 
-    SimUnlock(const std::string &title = "",
+    explicit SimUnlock(const std::string &title = "",
               const std::string &body = "",
               std::pair<std::uint8_t, std::uint8_t> pinMinMax = {0, -0});
     ~SimUnlock();
 
=== added directory 'src/qt'
=== added file 'src/qt/CMakeLists.txt'
--- src/qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qt/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,8 @@
+set(CMAKE_AUTOMOC ON)
+add_definitions(-DQT_NO_KEYWORDS)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
+add_subdirectory(src)
+add_subdirectory(qml)
 
=== added directory 'src/qt/include'
=== added directory 'src/qt/include/ubuntu'
=== added directory 'src/qt/include/ubuntu/connectivity'
=== added file 'src/qt/include/ubuntu/connectivity/NetworkingStatus'
--- src/qt/include/ubuntu/connectivity/NetworkingStatus	1970-01-01 00:00:00 +0000
+++ src/qt/include/ubuntu/connectivity/NetworkingStatus	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+#include <ubuntu/connectivity/networking-status.h>
 
=== added file 'src/qt/include/ubuntu/connectivity/networking-status.h'
--- src/qt/include/ubuntu/connectivity/networking-status.h	1970-01-01 00:00:00 +0000
+++ src/qt/include/ubuntu/connectivity/networking-status.h	2014-08-15 11:57:07 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef CONNECTIVITY_NETWORKING_STATUS_H
+#define CONNECTIVITY_NETWORKING_STATUS_H
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QVector>
+
+namespace ubuntu {
+namespace connectivity {
+
+
+class Q_DECL_EXPORT NetworkingStatus : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(NetworkingStatus)
+
+    Q_ENUMS(Limitations)
+    Q_ENUMS(Status)
+
+    Q_PROPERTY(QVector<Limitations> limitations
+               READ limitations
+               NOTIFY limitationsChanged)
+    Q_PROPERTY(Status status
+               READ status
+               NOTIFY statusChanged)
+
+public:
+    explicit NetworkingStatus(QObject *parent = 0);
+    virtual ~NetworkingStatus();
+
+    enum Limitations {
+        Bandwith
+    };
+
+    enum Status {
+        Offline,
+        Connecting,
+        Online
+    };
+
+    QVector<Limitations> limitations() const;
+    Status status() const;
+
+Q_SIGNALS:
+    void limitationsChanged();
+    void statusChanged(Status value);
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+}
+}
+
+Q_DECLARE_METATYPE(ubuntu::connectivity::NetworkingStatus::Limitations)
+Q_DECLARE_METATYPE(QVector<ubuntu::connectivity::NetworkingStatus::Limitations>)
+Q_DECLARE_METATYPE(ubuntu::connectivity::NetworkingStatus::Status)
+
+#endif // CONNECTIVITY_NETWORKING_STATUS_H
 
=== added directory 'src/qt/qml'
=== added file 'src/qt/qml/CMakeLists.txt'
--- src/qt/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qt/qml/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Ubuntu)
 
=== added directory 'src/qt/qml/Ubuntu'
=== added file 'src/qt/qml/Ubuntu/CMakeLists.txt'
--- src/qt/qml/Ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Connectivity)
 
=== added directory 'src/qt/qml/Ubuntu/Connectivity'
=== added file 'src/qt/qml/Ubuntu/Connectivity/CMakeLists.txt'
--- src/qt/qml/Ubuntu/Connectivity/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,38 @@
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+find_package(Qt5Quick REQUIRED)
+
+set(CORE_SRCS
+    networking-status.cpp
+    plugin.cpp
+)
+include_directories(${CMAKE_SOURCE_DIR}/src/qt/include)
+
+add_library(connectivity-qml SHARED
+    ${CORE_SRCS}
+)
+target_link_libraries(connectivity-qml ${CONNECTIVITY_QT_LIB_TARGET})
+
+qt5_use_modules(connectivity-qml Qml)
+
+get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)
+file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
+
+install(
+  TARGETS connectivity-qml
+  ARCHIVE DESTINATION ${QT_IMPORTS_DIR}/Ubuntu/Connectivity
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION ${QT_IMPORTS_DIR}/Ubuntu/Connectivity
+)
+
+install(
+  FILES qmldir
+  DESTINATION ${QT_IMPORTS_DIR}/Ubuntu/Connectivity
+)
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
 
=== added file 'src/qt/qml/Ubuntu/Connectivity/networking-status.cpp'
--- src/qt/qml/Ubuntu/Connectivity/networking-status.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/networking-status.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "networking-status.h"
+
+NetworkingStatus::NetworkingStatus(QObject *parent)
+        : ubuntu::connectivity::NetworkingStatus(parent)
+{
+    connect(this, &NetworkingStatus::statusChanged, [this](Status value){
+        value == Status::Online ? Q_EMIT onlineChanged(true) : Q_EMIT onlineChanged(false);
+    });
+}
+
+NetworkingStatus::~NetworkingStatus()
+{}
+
+bool
+NetworkingStatus::online() const
+{
+    return status() == Status::Online;
+}
+
+bool
+NetworkingStatus::limitedBandwith() const
+{
+    return limitations().contains(Limitations::Bandwith);
+}
 
=== added file 'src/qt/qml/Ubuntu/Connectivity/networking-status.h'
--- src/qt/qml/Ubuntu/Connectivity/networking-status.h	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/networking-status.h	2014-08-15 11:57:07 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef QML_CONNECTIVITY_NETWORKING_STATUS_H
+#define QML_CONNECTIVITY_NETWORKING_STATUS_H
+
+#include <QObject>
+#include <QThread>
+
+#include <ubuntu/connectivity/NetworkingStatus>
+
+class Q_DECL_EXPORT NetworkingStatus : public ubuntu::connectivity::NetworkingStatus
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool online
+               READ online
+               NOTIFY onlineChanged)
+
+    Q_PROPERTY(bool limitedBandwith
+               READ limitedBandwith
+               NOTIFY limitedBandwithChanged)
+
+public:
+    explicit NetworkingStatus(QObject *parent = 0);
+    virtual ~NetworkingStatus();
+
+    bool online() const;
+    bool limitedBandwith() const;
+
+Q_SIGNALS:
+    void onlineChanged(bool value);
+    void limitedBandwithChanged(bool value);
+};
+
+#endif // QML_CONNECTIVITY_NETWORKING_STATUS_H
 
=== added file 'src/qt/qml/Ubuntu/Connectivity/plugin.cpp'
--- src/qt/qml/Ubuntu/Connectivity/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/plugin.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "plugin.h"
+
+#include <QtQml>
+
+#include "networking-status.h"
+
+void
+QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
+{
+    // @uri Ubuntu.Connectivity
+    qmlRegisterType<NetworkingStatus> (uri, 1, 0, "NetworkingStatus");
+}
+
+void
+QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+  Q_UNUSED(uri);
+  Q_UNUSED(engine);
+}
+
+
 
=== added file 'src/qt/qml/Ubuntu/Connectivity/plugin.h'
--- src/qt/qml/Ubuntu/Connectivity/plugin.h	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/plugin.h	2014-08-15 11:57:07 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef QML_CONNECTIVITY_PLUGIN_H
+#define QML_CONNECTIVITY_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class QmlConnectivityNetworkingPlugin : public QQmlExtensionPlugin {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+    Q_INTERFACES(QQmlExtensionInterface)
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+
+#endif // QML_CONNECTIVITY_PLUGIN_H
+
 
=== added file 'src/qt/qml/Ubuntu/Connectivity/qmldir'
--- src/qt/qml/Ubuntu/Connectivity/qmldir	1970-01-01 00:00:00 +0000
+++ src/qt/qml/Ubuntu/Connectivity/qmldir	2014-08-15 11:57:07 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Connectivity
+plugin connectivity-qml
 
=== added directory 'src/qt/src'
=== added file 'src/qt/src/CMakeLists.txt'
--- src/qt/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qt/src/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,48 @@
+
+set(CONNECTIVITY_QT_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/connectivity-api/qt${CONNECTIVITY_QT_VERSION_MAJOR}")
+
+set(PUBLIC_HEADER_DIR "${CMAKE_SOURCE_DIR}/src/qt/include/ubuntu/connectivity")
+set(PUBLIC_HEADERS
+    ${PUBLIC_HEADER_DIR}/NetworkingStatus
+    ${PUBLIC_HEADER_DIR}/networking-status.h
+)
+
+#install the headers
+install(FILES ${PUBLIC_HEADERS}
+        DESTINATION "${CONNECTIVITY_QT_INCLUDE_DIR}/ubuntu/connectivity")
+
+include_directories(../include)
+set(CORE_SRCS
+    networking-status.cpp
+    dbus-properties-interface.cpp
+)
+
+add_library(${CONNECTIVITY_QT_LIB_TARGET} SHARED
+    ${CORE_SRCS}
+    ${PUBLIC_HEADERS} # public headers have to be included here for Q_DECL_EXPORT to work properly
+)
+
+qt5_use_modules(${CONNECTIVITY_QT_LIB_TARGET} Core DBus)
+
+install(
+  TARGETS ${CONNECTIVITY_QT_LIB_TARGET}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+set(SO_VERSION ${CONNECTIVITY_QT_VERSION_MAJOR})
+
+set_target_properties(${CONNECTIVITY_QT_LIB_TARGET} PROPERTIES
+                      SOVERSION ${SO_VERSION}
+)
+
+set(PC_FILE_TARGET "${CMAKE_CURRENT_BINARY_DIR}/${CONNECTIVITY_QT_LIB_TARGET}.pc")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CCONNECTIVITY_QT_INCLUDE_DIR}")
+set(ABSOLUTE_SO_FILE "${CMAKE_INSTALL_FULL_LIBDIR}/${CONNECTIVITY_QT_LIB_TARGET}.so.${SO_VERSION}")
+configure_file("connectivity-qt.pc.in" ${PC_FILE_TARGET} @ONLY)
+install(
+  FILES ${PC_FILE_TARGET}
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
 
=== added file 'src/qt/src/connectivity-qt.pc.in'
--- src/qt/src/connectivity-qt.pc.in	1970-01-01 00:00:00 +0000
+++ src/qt/src/connectivity-qt.pc.in	2014-08-15 11:57:07 +0000
@@ -0,0 +1,10 @@
+libdir=@libdir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/
+Requires: Qt5DBus
+Libs: @ABSOLUTE_SO_FILE@
+
+Name: connectivity-qt1
+Description: Ubuntu Connectivity API
+Version: @CONNECTIVITY_QT_VERSION_MAJOR@.@CONNECTIVITY_QT_VERSION_MINOR@
 
=== added file 'src/qt/src/dbus-properties-interface.cpp'
--- src/qt/src/dbus-properties-interface.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/src/dbus-properties-interface.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "dbus-properties-interface.h"
+
+DBusPropertiesInterface::DBusPropertiesInterface(const QString &service,
+                                                 const QString &path,
+                                                 const QDBusConnection &connection,
+                                                 QObject *parent)
+    : QDBusAbstractInterface(service,
+                             path,
+                             staticInterfaceName(),
+                             connection,
+                             parent)
+{}
+
+DBusPropertiesInterface::~DBusPropertiesInterface()
+{}
 
=== added file 'src/qt/src/dbus-properties-interface.h'
--- src/qt/src/dbus-properties-interface.h	1970-01-01 00:00:00 +0000
+++ src/qt/src/dbus-properties-interface.h	2014-08-15 11:57:07 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef DBUSPROPERTIES_H
+#define DBUSPROPERTIES_H
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+class DBusPropertiesInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.DBus.Properties"; }
+
+public:
+    DBusPropertiesInterface(const QString &service,
+                            const QString &path,
+                            const QDBusConnection &connection,
+                            QObject *parent = 0);
+
+    ~DBusPropertiesInterface();
+
+Q_SIGNALS:
+    void PropertiesChanged(const QString interface_name,
+                           const QVariantMap &changed_properties,
+                           const QStringList &invalidated_properties);
+};
+
+#endif
 
=== added file 'src/qt/src/networking-status.cpp'
--- src/qt/src/networking-status.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/src/networking-status.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <ubuntu/connectivity/NetworkingStatus>
+#include "dbus-properties-interface.h"
+
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+#include <QDBusMetaType>
+
+#include <QDebug>
+
+using namespace ubuntu::connectivity;
+
+#define SERVICE_NAME "com.ubuntu.connectivity1"
+#define SERVICE_INTERFACE "com.ubuntu.connectivity1.NetworkingStatus"
+#define SERVICE_PATH "/com/ubuntu/connectivity1/NetworkingStatus"
+
+
+class Q_DECL_HIDDEN NetworkingStatus::Private : public QObject
+{
+    Q_OBJECT
+
+public:
+    // Yes, it's raw.
+    NetworkingStatus *q;
+
+    QDBusConnection m_bus;
+
+    QVector<NetworkingStatus::Limitations> m_limitations;
+    NetworkingStatus::Status m_status;
+
+    QScopedPointer<QDBusServiceWatcher> m_watch;
+    QScopedPointer<QDBusInterface> m_interface;
+    QScopedPointer<DBusPropertiesInterface> m_properties_interface;
+
+    Private() = delete;
+    Private(NetworkingStatus *q)
+        : q{q},
+          m_bus{QDBusConnection::sessionBus()}
+    {
+        m_limitations = {};
+        m_status = Status::Online;
+
+        m_interface.reset(new QDBusInterface(SERVICE_NAME,
+                                             SERVICE_PATH,
+                                             SERVICE_INTERFACE,
+                                             m_bus));
+        m_properties_interface.reset(new DBusPropertiesInterface(SERVICE_NAME,
+                                                                 SERVICE_PATH,
+                                                                 m_bus));
+        connect(m_properties_interface.data(),
+                SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)),
+                this,
+                SLOT(propertiesChanged(QString,QVariantMap,QStringList)));
+
+        m_watch.reset(new QDBusServiceWatcher(SERVICE_NAME,
+                                              m_bus,
+                                              QDBusServiceWatcher::WatchForOwnerChange));
+        connect(m_watch.data(), &QDBusServiceWatcher::serviceOwnerChanged, this, &Private::serviceOwnerChanged);
+        if (m_bus.interface()->isServiceRegistered(SERVICE_NAME)) {
+            serviceOwnerChanged(SERVICE_NAME,
+                                "",
+                                m_bus.interface()->serviceOwner(SERVICE_NAME).value());
+        } else {
+            serviceOwnerChanged(SERVICE_NAME, "", "");
+        }
+    }
+
+    void updateLimitations(QStringList values)
+    {
+        QVector<NetworkingStatus::Limitations> tmp;
+        for (auto str : values) {
+            if (str == "bandwith")
+                tmp << NetworkingStatus::Limitations::Bandwith;
+            else
+                qWarning() << __PRETTY_FUNCTION__ << ": Invalid limitation: " << str;
+        }
+        if (m_limitations == tmp)
+            return;
+        m_limitations = tmp;
+        Q_EMIT q->limitationsChanged();
+    }
+
+    void updateStatus(QString value)
+    {
+        NetworkingStatus::Status tmp;
+        if (value == "offline")
+            tmp = NetworkingStatus::Status::Offline;
+        else if (value == "connecting")
+            tmp = NetworkingStatus::Status::Connecting;
+        else if (value == "online")
+            tmp = NetworkingStatus::Status::Online;
+        else {
+            qWarning() << __PRETTY_FUNCTION__ << ": Invalid status: " << value;
+            return;
+        }
+
+        if (m_status == tmp)
+            return;
+        m_status = tmp;
+        Q_EMIT q->statusChanged(m_status);
+    }
+
+    void reset()
+    {
+        updateLimitations({});
+        updateStatus("online");
+    }
+
+public Q_SLOTS:
+    void serviceOwnerChanged(const QString &serviceName,
+                             const QString &oldOwner,
+                             const QString &newOwner)
+    {
+        Q_UNUSED(serviceName);
+        Q_UNUSED(oldOwner);
+        if (newOwner.isEmpty()) {
+            // disappeared
+            reset();
+        } else {
+            // appeared
+            updateLimitations(m_interface->property("Limitations").toStringList());
+            updateStatus(m_interface->property("Status").toString());
+        }
+    }
+
+    void propertiesChanged(const QString &interface_name,
+                           const QVariantMap &changed_properties,
+                           const QStringList &invalidated_properties)
+    {
+        Q_UNUSED(interface_name);
+        Q_UNUSED(invalidated_properties);
+
+        if (changed_properties.contains("Limitations")) {
+            updateLimitations(changed_properties["Limitations"].toStringList());
+        }
+
+        if (changed_properties.contains("Status")) {
+            updateStatus(changed_properties["Status"].toString());
+        }
+    }
+};
+
+NetworkingStatus::NetworkingStatus(QObject *parent)
+        : QObject(parent),
+          d{new Private(this)}
+{
+
+    qRegisterMetaType<ubuntu::connectivity::NetworkingStatus::Limitations>();
+    qRegisterMetaType<QVector<ubuntu::connectivity::NetworkingStatus::Limitations>>();
+    qRegisterMetaType<ubuntu::connectivity::NetworkingStatus::Status>();
+}
+
+NetworkingStatus::~NetworkingStatus()
+{}
+
+QVector<NetworkingStatus::Limitations>
+NetworkingStatus::limitations() const
+{
+    return d->m_limitations;
+}
+
+NetworkingStatus::Status
+NetworkingStatus::status() const
+{
+    return d->m_status;
+}
+
+#include "networking-status.moc"
 
=== modified file 'src/secret-agent/CMakeLists.txt'
--- src/secret-agent/CMakeLists.txt	2013-10-14 21:00:54 +0000
+++ src/secret-agent/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -1,3 +1,4 @@
+set(CMAKE_AUTOMOC ON)
 
 set(
 	INDICATOR_SECRET_AGENT_SOURCES
 
=== modified file 'src/secret-agent/PasswordMenu.cpp'
--- src/secret-agent/PasswordMenu.cpp	2014-03-28 15:47:23 +0000
+++ src/secret-agent/PasswordMenu.cpp	2014-08-15 11:57:07 +0000
@@ -28,8 +28,8 @@
 class PasswordMenuPriv {
 public:
 	PasswordMenuPriv() :
-			m_connection(g_bus_get_sync(G_BUS_TYPE_SESSION, NULL,
-			NULL)), m_exportedActionGroupId(0), m_exportedMenuModelId(0) {
+			m_connection(g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr,
+			nullptr)), m_exportedActionGroupId(0), m_exportedMenuModelId(0) {
 	}
 
 	~PasswordMenuPriv() {
@@ -104,7 +104,7 @@
 		exportrev++;
 		p->m_actionPath = PASSWORD_ACTION_PATH.arg(exportrev);
 		p->m_exportedActionGroupId = g_dbus_connection_export_action_group(
-				p->m_connection, p->m_actionPath.toUtf8().data(), actions, NULL);
+				p->m_connection, p->m_actionPath.toUtf8().data(), actions, nullptr);
 	} while (p->m_exportedActionGroupId == 0 && exportrev < 128);
 
 	/* Export the menu.  If we can't get a name, keep trying to
@@ -116,7 +116,7 @@
 		p->m_menuPath = PASSWORD_MENU_PATH.arg(exportrev);
 		p->m_exportedMenuModelId = g_dbus_connection_export_menu_model(
 				p->m_connection, p->m_menuPath.toUtf8().data(),
-				G_MENU_MODEL(menu), NULL);
+				G_MENU_MODEL(menu), nullptr);
 	} while (p->m_exportedMenuModelId == 0 && exportrev < 128);
 
 	/* Unref the objects as a reference is maintained by the fact that they're
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-05-02 08:44:47 +0000
+++ tests/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -1,7 +1,5 @@
 
-set(CMAKE_AUTOMOC OFF)
 include(FindGMock)
-set(CMAKE_AUTOMOC ON)
 
 find_package("Valgrind" REQUIRED)
 
 
=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2014-04-01 16:12:16 +0000
+++ tests/integration/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(qt)
 
 add_definitions(-DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/network/indicator-network-service")
 
 
=== added directory 'tests/integration/qt'
=== added file 'tests/integration/qt/CMakeLists.txt'
--- tests/integration/qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,4 @@
+set(CMAKE_AUTOMOC ON)
+
+add_subdirectory(cpp)
+add_subdirectory(qml)
 
=== added directory 'tests/integration/qt/cpp'
=== added file 'tests/integration/qt/cpp/CMakeLists.txt'
--- tests/integration/qt/cpp/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/cpp/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,16 @@
+
+include_directories(${CMAKE_SOURCE_DIR}/src/qt/include)
+set(TEST_SRCS
+    main.cpp
+    tst_networking.cpp
+)
+
+set(testCommand dbus-test-runner -t ${CMAKE_CURRENT_BINARY_DIR}/cpptest
+    -p -o -p ${CMAKE_BINARY_DIR}/cpptest.xml,xunitxml
+    -p -o -p -,txt)
+
+add_executable(cpptest ${TEST_SRCS})
+target_link_libraries(cpptest ${CONNECTIVITY_QT_LIB_TARGET})
+qt5_use_modules(cpptest Core Test)
+
+add_test(qtcpptests ${testCommand})
 
=== added file 'tests/integration/qt/cpp/main.cpp'
--- tests/integration/qt/cpp/main.cpp	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/cpp/main.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,33 @@
+/* This file is part of unity-action-api
+ * Copyright 2013 Canonical Ltd.
+ *
+ * unity-action-api is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * unity-action-api is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest/QtTest>
+#include <QCoreApplication>
+
+#include "tst_networking.h"
+
+int main(int argc, char *argv[])
+{
+    // needed for QTest::qWait
+    QCoreApplication app(argc, argv);
+
+    TestNetworking tst_networking;
+
+    if (QTest::qExec(&tst_networking, argc, argv) != 0)
+        return 1;
+
+    return 0;
+}
 
=== added file 'tests/integration/qt/cpp/tst_networking.cpp'
--- tests/integration/qt/cpp/tst_networking.cpp	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/cpp/tst_networking.cpp	2014-08-15 11:57:07 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "tst_networking.h"
+
+#include <ubuntu/connectivity/NetworkingStatus>
+
+#include <QtTest/QtTest>
+
+void
+TestNetworking::initTestCase()
+{}
+
+void
+TestNetworking::cleanupTestCase()
+{}
+
+void
+TestNetworking::cleanup()
+{}
+
+
+void
+TestNetworking::testApi()
+{
+    using namespace ubuntu::connectivity;
+
+    auto ns = new NetworkingStatus();
+
+    QVERIFY(ns->metaObject()->indexOfProperty("limitations") != -1);
+    QVERIFY(ns->metaObject()->indexOfProperty("status") != -1);
+
+    QVERIFY(ns->limitations() == QVector<NetworkingStatus::Limitations>());
+    QVERIFY(ns->status() == NetworkingStatus::Online);
+}
 
=== added file 'tests/integration/qt/cpp/tst_networking.h'
--- tests/integration/qt/cpp/tst_networking.h	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/cpp/tst_networking.h	2014-08-15 11:57:07 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <QObject>
+
+#include <ubuntu/connectivity/NetworkingStatus>
+
+
+class TestNetworking : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void cleanup();
+
+    void testApi();
+
+private:
+};
+
 
=== added directory 'tests/integration/qt/qml'
=== added file 'tests/integration/qt/qml/CMakeLists.txt'
--- tests/integration/qt/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/qml/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -0,0 +1,19 @@
+add_custom_target(qmltests)
+
+find_program(qmltestrunner_exe qmltestrunner)
+
+if(NOT qmltestrunner_exe)
+  msg(FATAL_ERROR "Could not locate qmltestrunner.")
+endif()
+
+set(qmltest_command
+  dbus-test-runner -t env -p "QT_QPA_PLATFORM=minimal"
+  -p ${qmltestrunner_exe} -p -input -p ${CMAKE_CURRENT_SOURCE_DIR}/tst_api.qml
+  -p -import -p ${CMAKE_BINARY_DIR}/src/qt/qml
+  -p -o -p ${CMAKE_BINARY_DIR}/testapi.xml,xunitxml
+  -p -o -p -,txt
+)
+
+add_custom_target(qmltest_api ${qmltest_command})
+add_dependencies(qmltests qmltest_api)
+add_test(qmltests ${qmltest_command})
 
=== added file 'tests/integration/qt/qml/tst_api.qml'
--- tests/integration/qt/qml/tst_api.qml	1970-01-01 00:00:00 +0000
+++ tests/integration/qt/qml/tst_api.qml	2014-08-15 11:57:07 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+import Ubuntu.Connectivity 1.0
+import QtQuick 2.0
+import QtTest 1.0
+
+/* This test will make sure there are no unintentional changes to the
+ * schemantics of the API (default properties work as expected, etc)
+ * so that any files written to the prior release of the library
+ * will not bail out when loaded resulting in client applications failing
+ * to start.
+ */
+Item {
+
+    NetworkingStatus {
+        id: networkingStatus
+        onStatusChanged: {}
+        onLimitationsChanged: {}
+        onOnlineChanged: {}
+        onLimitedBandwithChanged: {}
+    }
+
+    TestCase {
+        name: "API Test"
+        id: test_api
+
+        property int status : networkingStatus.status
+        property int online : networkingStatus.online
+        property int limitedBandwith : networkingStatus.limitedBandwith
+
+        function test_api() {
+            // just make sure this file can be loaded properly by the QmlEngine.
+            verify(1)
+        }
+    }
+}
 
=== modified file 'tests/unit/secret-agent/CMakeLists.txt'
--- tests/unit/secret-agent/CMakeLists.txt	2014-08-15 11:57:07 +0000
+++ tests/unit/secret-agent/CMakeLists.txt	2014-08-15 11:57:07 +0000
@@ -1,3 +1,4 @@
+set(CMAKE_AUTOMOC ON)
 
 include_directories("${CMAKE_SOURCE_DIR}/src/secret-agent")
 include_directories("${CMAKE_BINARY_DIR}/src/secret-agent")