Merge lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras into lp:indicator-network/15.10

[Pete Woods]

Take ownership of qt connectivity libraries from connectivity-api source package.
Use cmake-extras for docs, translations, etc.

Take ownership of qt connectivity libraries from connectivity-api source package.
Use cmake-extras for docs, translations, etc.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/340/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/129/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

502. By Pete Woods on 2015-05-06

Add QML properties from original connectivity API

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/130/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

503. By Pete Woods on 2015-05-07

Generate docs using cmake-extras macros

504. By Pete Woods on 2015-05-07

Fix doc build for Qt

505. By Pete Woods on 2015-05-07

Missing install file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/131/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

506. By Pete Woods on 2015-05-07

Missing intltool dependency

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/343/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/132/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

507. By Pete Woods on 2015-05-07

Don't build potfile in all target, or we get double target dependency

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/133/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

508. By Pete Woods on 2015-05-12

Add braces

509. By Pete Woods on 2015-05-12

Handle recursion without an infinite loop

510. By Pete Woods on 2015-05-12

Don't throw exceptions on notification error

511. By Pete Woods on 2015-05-12

Clean up CMake for easier debug on device

512. By Pete Woods on 2015-05-12

Put sane filters in the symbol map

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/346/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/135/console

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

review: Needs Fixing (continuous-integration)

[lp:~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras]

513. By Pete Woods on 2015-05-13

Add backwards-compatibility class

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/136/console

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

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2014-08-15 11:52:50 +0000
+++ .bzrignore	2015-05-13 10:12:45 +0000
@@ -7,4 +7,5 @@
 /.settings
 /build
 /buildclang
-
+/po/Makefile.in.in
+/po/POTFILES.in

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-16 08:51:24 +0000
+++ CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -5,7 +5,6 @@
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
-
 if("${build_type_lower}" STREQUAL debug)
   set(TRACE_DEFAULT TRUE)
 else()
@@ -13,6 +12,7 @@
 endif()
 
 option(trace_messages "Print debug trace messages." ${TRACE_DEFAULT})
+option(REMOTE_BUILD "Remote build (skip docs, translations, tests)." FALSE)
 
 if(${trace_messages})
   add_definitions(-DINDICATOR_NETWORK_TRACE_MESSAGES)
@@ -44,10 +44,15 @@
   GLIB REQUIRED
   glib-2.0>=${GLIB_REQUIRED_VERSION}
   gio-2.0>=${GLIB_REQUIRED_VERSION}
-  url-dispatcher-1
 )
 include_directories(${GLIB_INCLUDE_DIRS})
 
+pkg_check_modules(
+  UNITY_API REQUIRED
+  libunity-api
+)
+include_directories(${UNITY_API_INCLUDE_DIRS})
+
 set(OFONO_REQUIRED_VERSION 1.12)
 pkg_check_modules(
   OFONO REQUIRED
@@ -55,7 +60,6 @@
 )
 include_directories(${OFONO_INCLUDE_DIRS})
 
-
 set(NOTIFY_REQUIRED_VERSION 0.7.5)
 pkg_check_modules(
   NOTIFY REQUIRED
@@ -69,20 +73,11 @@
 find_package(Qt5DBus COMPONENTS Qt5DBusMacros REQUIRED)
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 
-find_package(Qt5Test REQUIRED)
-include_directories(${Qt5Test_INCLUDE_DIRS})
-
 pkg_check_modules(NM REQUIRED NetworkManager REQUIRED)
 include_directories(${NM_INCLUDE_DIRS})
 
-pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
-include_directories(${QTDBUSTEST_INCLUDE_DIRS})
-
-pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1 REQUIRED)
-include_directories(${QTDBUSMOCK_INCLUDE_DIRS})
-
-pkg_check_modules(GIO REQUIRED gio-2.0>=${GLIB_REQUIRED_VERSION})
-include_directories(${GIO_INCLUDE_DIRS})
+pkg_check_modules(URL_DISPATCHER REQUIRED url-dispatcher-1)
+include_directories(${URL_DISPATCHER_INCLUDE_DIRS})
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -101,24 +96,13 @@
   "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_lower 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()
-
 add_subdirectory(data)
 add_subdirectory(src)
+
+if(NOT REMOTE_BUILD)
+
 add_subdirectory(po)
+add_subdirectory(doc)
 
 enable_testing()
 add_subdirectory(tests)
@@ -135,7 +119,12 @@
     notify_cpp
     qdbus-stubs
     url_dispatcher_cpp
+  TESTS
+    unit-tests
+    integration-tests
   FILTER
     ${CMAKE_SOURCE_DIR}/tests/*
     ${CMAKE_BINARY_DIR}/*
 )
+
+endif()

=== removed file 'cmake/EnableCoverageReport.cmake'
--- cmake/EnableCoverageReport.cmake	2014-08-14 21:58:02 +0000
+++ cmake/EnableCoverageReport.cmake	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-# - 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()   

=== removed file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	2013-08-27 14:54:25 +0000
+++ cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
-set(GTEST_LIBRARIES gtest)
-set(GTEST_MAIN_LIBRARIES gtest_main)
-set(GMOCK_LIBRARIES gmock gmock_main)

=== removed file 'cmake/FindLcov.cmake'
--- cmake/FindLcov.cmake	2014-08-14 21:58:02 +0000
+++ cmake/FindLcov.cmake	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# - 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)

=== removed file 'cmake/Findgcovr.cmake'
--- cmake/Findgcovr.cmake	2014-08-14 21:58:02 +0000
+++ cmake/Findgcovr.cmake	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# - 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)

=== removed file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	2014-08-14 21:58:02 +0000
+++ cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# 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)

=== removed file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	2013-09-16 04:18:50 +0000
+++ cmake/UseGSettings.cmake	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" OFF)
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-04-15 15:04:51 +0000
+++ data/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -41,6 +41,21 @@
 add_schema ("com.canonical.indicator.network.gschema.xml")
 
 ###########################
+# PkgConfig
+###########################
+
+configure_file(
+  "connectivity-qt.pc.in"
+  "connectivity-qt.pc"
+  @ONLY
+)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/connectivity-qt.pc"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+###########################
 # XDG Autostart File
 ###########################
 

=== added file 'data/connectivity-qt.map'
--- data/connectivity-qt.map	1970-01-01 00:00:00 +0000
+++ data/connectivity-qt.map	2015-05-13 10:12:45 +0000
@@ -0,0 +1,17 @@
+{
+global:
+    extern "C++" {
+        typeinfo?for?connectivityqt::Connectivity;
+        typeinfo?for?ubuntu::connectivity::NetworkingStatus;
+        VTT?for?connectivityqt::Connectivity;
+        VTT?for?ubuntu::connectivity::NetworkingStatus;
+        virtual?thunk?to?connectivityqt::Connectivity;
+        virtual?thunk?to?ubuntu::connectivity::NetworkingStatus;
+        vtable?for?connectivityqt::Connectivity;
+        vtable?for?ubuntu::connectivity::NetworkingStatus;
+        connectivityqt::Connectivity::[!P]*;
+        ubuntu::connectivity::NetworkingStatus::[!P]*;
+    };
+local:
+    *;
+};

=== added file 'data/connectivity-qt.pc.in'
--- data/connectivity-qt.pc.in	1970-01-01 00:00:00 +0000
+++ data/connectivity-qt.pc.in	2015-05-13 10:12:45 +0000
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+ 
+Name: libconnectivity-qt
+Description: Connectivity API for Qt
+Version: 1.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lconnectivity-qt

=== added file 'debian/connectivity-doc.install'
--- debian/connectivity-doc.install	1970-01-01 00:00:00 +0000
+++ debian/connectivity-doc.install	2015-05-13 10:12:45 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/connectivity-api/*

=== modified file 'debian/control'
--- debian/control	2015-03-31 10:39:35 +0000
+++ debian/control	2015-05-13 10:12:45 +0000
@@ -4,11 +4,15 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ken VanDine <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras (>= 0.4),
                dbus,
 # make g++ version explicit for ABI safety, see https://wiki.ubuntu.com/cpp-11
                g++-4.9,
                debhelper (>= 9.0.0),
+               doxygen,
                google-mock (>= 1.6.0+svn437),
+               graphviz,
+               intltool,
                libglib2.0-dev,
                libnotify-dev,
 #///! TODO: The next line should be removed once all dependancy on qmenumodel is removed
@@ -27,6 +31,8 @@
                qt5-default,
                qtbase5-dev,
                qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
                valgrind [amd64 armhf i386 powerpc],
 Standards-Version: 3.9.3
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -78,3 +84,53 @@
 Description: tools for working with indicator-network
  This package provides developer tools to aid in debugging
  and development of indicator-network.
+
+Package: libconnectivity-qt1
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         indicator-network (>= ${source:Version}),
+Recommends:
+         indicator-network (>= 0.5.1+14.10.20140819),
+Description: Ubuntu Connectivity 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: connectivity-doc,
+Description: Ubuntu Connectivity Qt API - development files
+ Ubuntu Connectivity API - Qt bindings
+ .
+ This package contains development files to develop against the Qt library.
+
+Package: qml-module-ubuntu-connectivity
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libconnectivity-qt1 (= ${binary:Version}),
+Description: Ubuntu Connectivity API 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	2015-05-13 10:12:45 +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	2015-05-13 10:12:45 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libconnectivity-qt1.so.*

=== added file 'debian/qml-module-ubuntu-connectivity.install'
--- debian/qml-module-ubuntu-connectivity.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-connectivity.install	2015-05-13 10:12:45 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml

=== added directory 'doc'
=== added file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,11 @@
+set(INSTALL_DOCDIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/connectivity-api)
+
+option(BUILD_DOC "Build documentation by default" TRUE)
+option(PRIVATE_DOCS "Build private documentation" FALSE)
+
+add_subdirectory(qt)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbus/
+    DESTINATION ${INSTALL_DOCDIR}/dbus/
+)

=== added directory 'doc/dbus'
=== added file 'doc/dbus/connectivity-api.txt'
--- doc/dbus/connectivity-api.txt	1970-01-01 00:00:00 +0000
+++ doc/dbus/connectivity-api.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,26 @@
+Service		com.ubuntu.connectivity1
+Interface	com.ubuntu.connectivity1.NetworkingStatus
+Object path	/com/ubuntu/connectivity1/NetworkingStatus
+Policy group	connectivity
+Supports	org.freedesktop.DBus.Introspectable
+		org.freedesktop.DBus.Properties
+
+Properties	array{string} Limitations [readonly]
+
+			String array representing the possible limitations
+			on networking.
+
+			Currently available limitations are:
+				"bandwith"
+
+			"bandwith" - indicates that the bandwith of the
+				Internet connection has limitations.
+				Applications should minimize their bandwith
+				usage if possible.
+
+		string Status [readonly]
+
+			Status of the Internet connectivity. 
+
+			Possible values:
+				"offline", "connecting", "online"

=== added directory 'doc/qt'
=== added file 'doc/qt/CMakeLists.txt'
--- doc/qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,3 @@
+add_subdirectory(cpp)
+add_subdirectory(qml)
+

=== added directory 'doc/qt/cpp'
=== added file 'doc/qt/cpp/CMakeLists.txt'
--- doc/qt/cpp/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,27 @@
+
+add_subdirectory(examples)
+
+include(UseDoxygen OPTIONAL)
+
+add_doxygen(
+    qtdoc
+    PROJECT_NAME
+        "connectivity-api"
+    INPUT
+        "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/pages"
+    STRIP_FROM_PATH
+        "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
+    STRIP_FROM_INC_PATH
+        "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
+    EXCLUDE_PATTERNS
+        */internal/*
+    EXCLUDE_SYMBOLS
+	*::internal*
+        *::Priv
+    INSTALL
+        "${INSTALL_DOCDIR}/cpp"
+    XML
+    ALL
+)
+

=== added directory 'doc/qt/cpp/css'
=== added file 'doc/qt/cpp/css/base.css'
--- doc/qt/cpp/css/base.css	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/css/base.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,638 @@
+/**
+* Ubuntu Developer base stylesheet
+*
+* A base stylesheet containing site-wide styles
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards
+* @copyright 2011 Canonical Ltd.
+*/
+
+/**
+* @section Global
+*/
+
+body {
+	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+	font-size: 13px;
+	line-height: 1.4;
+	color: #333;
+}
+a {
+	color: #dd4814;
+	text-decoration: none;
+	outline: 0;
+}
+p, dl {
+	margin-bottom: 10px;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+code{
+	padding: 10px;
+	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
+	background-color: #fdf6f2;
+	display: block;
+	margin-bottom: 10px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+h1 {
+	font-size: 36px;
+	line-height: 1.1;
+	margin-bottom: 20px;
+}
+article h1,
+h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin-bottom: 14px;
+}
+h3 {
+	font-size: 16px;
+	line-height: 1.3;
+	margin-bottom: 8px;
+}
+h4 {
+	font-weight: bold;
+}
+
+time {
+	color:#999;
+}
+
+/**
+* @section Structure
+*/
+
+.header-login,
+.header-navigation div,
+.header-content div {
+	margin: 0 auto;
+	width: 940px;
+}
+
+.header-content h1{
+	background-color:#ffffff;
+	display:inline-block;
+}
+
+.header-content h2{
+	background-color:#ffffff;
+	display:table;
+}
+
+.header-login ul {
+	margin: 4px 0;
+	float: right;
+}
+.header-login li {
+	margin-right: 10px;
+	float: left;
+}
+.header-login a {
+	color: #333;
+}
+.header-navigation {
+	border-top: 2px solid #dd4814;
+	border-bottom: 2px solid #dd4814;
+	background-color: #fff;
+	height: 54px;
+	clear: right;
+	overflow: hidden;
+}
+.header-navigation nav ul {
+	border-right: 1px solid #dd4814;
+	float: right;
+}
+.header-navigation nav li {
+	border-left: 1px solid #dd4814;
+	float: left;
+	height: 54px;
+}
+.header-navigation nav a {
+	padding: 18px 14px 0;
+	font-size: 14px;
+	display: block;
+	height: 36px;
+}
+.header-navigation nav a:hover {
+	background-color: #fcece7;
+}
+.header-navigation nav .current_page_item a,
+.header-navigation nav .current_page_parent a,
+.header-navigation nav .current_page_ancestor a {
+	background-color: #dd4814;
+	color: #fff;
+}
+.header-navigation input {
+	margin: 12px 10px 0 10px;
+	padding: 5px;
+	border-top: 1px solid #a1a1a1;
+	border-right: 1px solid #e0e0e0;
+	border-bottom: 1px solid #fff;
+	border-left: 1px solid #e0e0e0;
+	width: 90px;
+	font-style: italic;
+	color: #ccc;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+	border-radius: 3px;
+		-moz-box-shadow: inset 0 1px 1px #e0e0e0;
+	   -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
+   box-shadow: inset 0 1px 1px #e0e0e0;
+}
+.header-navigation h2 {
+	margin: 18px 0 0 6px;
+	text-transform: lowercase;
+	font-size: 22px;
+	color: #dd4814;
+	float: left;
+}
+.header-navigation .logo-ubuntu {
+	margin-top: 12px;
+	float: left;
+}
+.header-content .header-navigation-secondary {
+	margin-bottom: 40px;
+	padding: 0;
+	position: relative;
+	z-index: 2;
+}
+.header-navigation-secondary div {
+	padding: 0;
+	border: 2px solid #dd4814;
+		-moz-border-radius: 0px 0px 4px 4px;
+		-webkit-border-radius: 0px 0px 4px 4px;
+	border-radius: 0px 0px 4px 4px;
+	background: #fff;
+	border-top: 0px;
+	width: 936px;
+}
+.header-navigation-secondary nav li {
+	float: left;
+}
+.header-navigation-secondary nav li a {
+	color: #333;
+	display: block;
+	height: 25px;
+	padding: 8px 8px 0;
+}
+.header-navigation-secondary nav li:hover,
+.header-navigation-secondary nav .current_page_item a {
+	background: url("../img/sec-nav-hover.gif");
+}
+.header-content {
+	padding-bottom: 30px;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 1px 3px #e0e0e0;
+		-webkit-box-shadow: 0 1px 3px #e0e0e0;
+	box-shadow: 0 1px 3px #e0e0e0;
+	margin-bottom: 3px;
+	position: relative;
+	overflow: hidden;
+}
+footer {
+	padding: 10px 10px 40px 10px;
+	position: relative;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+	font-size: 12px;
+	background: url("../img/background-footer.png") repeat scroll 0 0 #f7f6f5;
+}
+footer div {
+	margin: 0 auto;
+    padding: 0 10px;
+    width: 940px;
+}
+footer a {
+	color: #000;
+}
+footer nav ul {
+	margin: 10px 17px 30px 0;
+	width: 172px;
+	display: inline-block;
+	vertical-align: top;
+	height: auto;
+	zoom: 1;
+	*display: inline;
+}
+footer nav ul.last {
+	margin-right: 0;
+}
+footer nav li {
+	margin-bottom: 8px;
+}
+footer nav li:first-child {
+	font-weight: bold;
+}
+footer p {
+	margin-bottom: 0;
+}
+#content {
+	padding-top: 35px;
+}
+.arrow-nav {
+	display: none;
+	position: absolute;
+	top: -1px;
+	z-index: 3;
+}
+.shadow {
+	margin: 30px 0 3px 0;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 2px 3px #e0e0e0;
+		-webkit-box-shadow: 0 2px 3px #e0e0e0;
+	box-shadow: 0 2px 3px #e0e0e0;
+	height: 3px;
+}
+
+/**
+* @section Site-wide
+*/
+
+#content h2{
+	font-size:24px;
+}
+
+.box-orange {
+	padding: 10px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-orange .link-action-small {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.link-bug {
+	margin-left: 10px;
+	color: #999;
+}
+.link-action {
+	float: left;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.link-action2 {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+	line-height: 1.3;
+}
+.link-action2 span{
+	display:block;
+	float:left;
+}
+.link-action2 .cta-left{
+	background:url(../img/button-cta-left.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+.link-action2 .cta-center{
+	background:url(../img/button-cta-slice.png) repeat-x;
+	line-height:45px;
+	height:48px;
+}
+.link-action2 .cta-right{
+	background:url(../img/button-cta-right.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+
+.link-action-small {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+}
+.link-action-small span{
+	display:block;
+	float:left;
+	height:42px;
+}
+.link-action-small .cta-left{
+	background:url(../img/button-cta-left-small.png) no-repeat;
+	width:19px;
+}
+.link-action-small .cta-center{
+	background:url(../img/button-cta-slice-small.png) repeat-x;
+	line-height:42px;
+}
+.link-action-small .cta-right{
+	background:url(../img/button-cta-right-small.png) no-repeat;
+	width:19px;
+}
+
+.link-action:active {
+	position: relative;
+	top: 1px;
+}
+.link-action2:active {
+	position: relative;
+	top: 1px;
+}
+.link-action-small:active {
+	position: relative;
+	top: 1px;
+}
+.list-bullets li {
+	margin-bottom: 10px;
+	list-style: disc;
+	list-style-position: inside;
+}
+.box {
+	margin-bottom: 30px;
+	padding: 15px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-padded {
+	margin-bottom: 30px;
+	padding: 5px;
+	border: 2px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background: url("../img/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
+	overflow: hidden;
+}
+.box-padded h3 {
+	 margin: 5px 0 10px 5px;
+}
+.box-padded div {
+	padding: 10px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: #fff;
+	overflow: hidden;
+}
+.box-padded li {
+	padding: 0 10px;
+	float: left;
+	width: 211px;
+	border-right: 1px dotted #aea79f;
+}
+.box-padded li.first {
+	padding: 0;
+	margin-bottom: 0;
+}
+.box-padded li.last {
+	border: 0;
+	width: 217px;
+}
+.box-padded img {
+	margin: 0 10px 50px 0;
+	float: left;
+		-moz-border-radius: 8px;
+		-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+.box-clear {
+	margin-bottom: 40px;
+}
+.box-clear .grid-4.first {
+	margin-right: 15px;
+	padding-right: 15px;
+}
+.box-clear .grid-4 {
+	margin-left: 0;
+	margin-right: 10px;
+	padding-right: 10px;
+	width: 298px;
+}
+.box-clear time {
+	display: block;
+	border-bottom: 1px dotted #aea79f;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+.box-clear div.first {
+	border-right: 1px dotted #aea79f;
+}
+.box-clear a {
+	display: block;
+}
+.box-clear .rss {
+	background: url("../img/rss.jpg") no-repeat scroll 0 center;
+	padding-left: 20px;
+}
+.box-clear .location {
+	display: block;
+	margin-bottom: 1px;
+}
+.box-clear .last {
+	margin: 0;
+	padding-right: 0;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: 293px;
+}
+
+/* Widgets */
+
+.ui-state-focus {
+	outline: none;
+}
+.ui-accordion {
+	border-bottom: 1px dotted #aea79f;
+}
+.ui-accordion a {
+	display: block;
+}
+.ui-accordion h3 {
+	margin-bottom: 0;
+	border-top: 1px dotted #aea79f;
+	position: relative;
+	font-size: 13px;
+	font-weight: bold;
+}
+.ui-accordion h3 a {
+	padding: 10px 0;
+	color: #333;
+}
+.ui-accordion h4 {
+	margin-bottom: 5px;
+}
+.ui-accordion div fieldset {
+	padding-bottom: 5px;
+}
+.ui-accordion div li,
+.ui-accordion div input {
+	margin-bottom: 10px;
+}
+.ui-accordion .ui-icon {
+	position: absolute;
+	top: 15px;
+	right: 0;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background: url("../img/icon-accordion-inactive.png") 0 0 no-repeat transparent;
+}
+.ui-accordion .ui-state-active .ui-icon {
+	background-image: url("../img/icon-accordion-active.png");
+}
+.ui-accordion .current_page_item a {
+	color: #333;
+}
+.container-tweet {
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	padding: 10px 10px 10px;
+	background-color: #f7f7f7;
+}
+.container-tweet .tweet-follow {
+	margin-top: 10px;
+	margin-bottom: -10px;
+	padding-left: 55px;
+	padding-bottom: 6px;
+	background: url("../img/tweet-follow.png") 0 5px no-repeat;
+	display: block;
+}
+.container-tweet .tweet-follow span {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.2;
+	display: block;
+}
+.tweet a {
+	display: inline;
+}
+.tweet .tweet_text {
+	padding: 10px;
+	background-color: #fff;
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	border: 1px solid #dd4814;
+	font-size: 16px;
+	display: block;
+	clear: both;
+}
+.tweet.tweet-small .tweet_text {
+	font-size: inherit;
+}
+.tweet .tweet_text a {
+	color: #333;
+}
+.tweet .tweet_time,
+.tweet .tweet_user_and_time {
+	padding: 15px 0 10px 0;
+	position: relative;
+	top: -2px;
+	background: url("../img/tweet-arrow.png") no-repeat;
+	display: block;
+}
+.tweet .tweet_odd .tweet_time,
+.tweet .tweet_odd .tweet_user_and_time {
+	background-position: right 0;
+	float: right;
+}
+.tweet .tweet_even .tweet_time,
+.tweet .tweet_even .tweet_user_and_time {
+	background-position: left 0;
+	float: left;
+}
+
+/* Search */
+
+#content .list-search li {
+	list-style-type:none;
+	border:0px;
+	margin-bottom: 15px;
+	padding-top: 15px;
+}
+
+/* Blog */
+
+.blog-article #nav-single {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+.blog-article #nav-single .nav-next {
+	float: right;
+}
+.blog-article article header .entry-meta {
+	margin-bottom: 20px;
+}
+.blog-article article .entry-meta {
+	color: #999;
+}
+.blog-article #respond form input[type="submit"] {
+	float: left;
+	cursor: pointer;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-left: 3px solid #e6633a;
+	border-right: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.blog-article #respond form input[type="submit"]:active {
+	position: relative;
+	top: 1px;
+}
+
+.alignnone{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignleft{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignright{
+    float:right;
+   margin:10px 0 10px 20px;
+}
+
+.aligncenter{
+	float:left;
+    margin:10px 20px 10px 0;
+}
+.entry-content h2, .entry-content h3{
+    margin-top:20px;
+}
+.entry-content ul li{
+    list-style-type: circle;
+    margin-left:16px;
+}
+
+.entry-content hr{
+	border:none;
+	border-top: 1px dotted #AEA79F;
+}

=== added file 'doc/qt/cpp/css/qtquick.css'
--- doc/qt/cpp/css/qtquick.css	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/css/qtquick.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,772 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    ul li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1.title
+    {
+        font-weight: bold;
+        font-size: 150%;
+    }
+    h0
+    {
+        font-weight: bold;
+        font-size: 130%;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin: 0 1.5em 0 1.5em;
+        font-family: ubuntu;
+        line-height: normal
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 1em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: black;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #202020;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-left: 5px;
+        margin-top: 5px;
+        margin-bottom: 0.5em;
+    }
+
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 130%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 110%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .toc
+    {
+        font-size: 80%
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
+
+
+/* modify the TOC layouts */
+div.toc ul {
+    padding-left: 20px;
+}
+div.toc li {
+    padding-left: 4px;
+}
+/* Remove the border around images*/
+a img
+{
+    border:none;
+}
+
+/*Add styling to the front pages*/
+
+.threecolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.threecolumn_piece
+{
+    display: inline-block;
+    margin-left: 78px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 25.5%;
+}
+div.threecolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.threecolumn_piece p {
+    margin-bottom: 7px;
+    color: #5C626E;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.threecolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.threecolumn_piece a {
+    font-weight: normal;
+}
+/* Add style to guide page*/
+.fourcolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.fourcolumn_piece
+{
+    display: inline-block;
+    margin-left: 35px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 21.3%;
+}
+div.fourcolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.fourcolumn_piece p {
+    margin-bottom: 7px;
+    color: #40444D;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.fourcolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.fourcolumn_piece a {
+    font-weight: normal;
+}

=== added file 'doc/qt/cpp/css/reset.css'
--- doc/qt/cpp/css/reset.css	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/css/reset.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file

=== added file 'doc/qt/cpp/css/scratch.css'
--- doc/qt/cpp/css/scratch.css	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/css/scratch.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,61 @@
+body {
+	margin: 0;
+}
+
+
+div.toc ul {
+	padding: 0;
+}
+
+div.toc li {
+	margin-bottom: 3px;
+}
+
+h1.title {
+	font-size: 36px;
+	line-height: 1.1;
+	font-weight: normal;
+}
+h0, h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin: 14px 0;
+	font-weight: normal;
+	display: block;
+}
+a:hover {
+	color: #dd4814;
+	text-decoration: underline;
+	outline: 0;
+}
+table, pre {
+	border-radius: 0;
+}
+
+.annotated td {
+	padding: 0.8em 1em 0.3em;
+}
+.wrapper {
+	width: 940px;
+	margin: 0 auto;
+}
+.main-content {
+	width: 668px;
+	position: relative;
+	left: 270px;
+}
+.title {
+	margin-left: -270px;
+	margin-top: 30px;
+	margin-bottom: 50px;
+}
+.toc {
+	margin-left: -270px;
+	font-size: 100%;
+	margin-bottom: 40px;
+    padding: 0;
+    z-index: 2;
+    position: absolute;
+    top: 100px;
+    width: 250px;
+}

=== added directory 'doc/qt/cpp/examples'
=== added file 'doc/qt/cpp/examples/CMakeLists.txt'
--- doc/qt/cpp/examples/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/examples/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,7 @@
+
+include_directories(${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt)
+add_executable(
+  networking_status
+  example_networking_status.cpp
+)
+target_link_libraries(networking_status connectivity-qt)

=== added file 'doc/qt/cpp/examples/example_networking_status.cpp'
--- doc/qt/cpp/examples/example_networking_status.cpp	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/examples/example_networking_status.cpp	2015-05-13 10:12:45 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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 <QCoreApplication>
+#include <QScopedPointer>
+#include <QDebug>
+
+//! [include]
+#include <connectivityqt/connectivity.h>
+using namespace connectivityqt;
+//! [include]
+
+int
+main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    //! [create networkingstatus]
+    QScopedPointer<Connectivity> ns(new Connectivity());
+    //! [create networkingstatus]
+
+    //! [status]
+    // normal getter
+    if (ns->status() == Connectivity::Status::Online)
+    {
+        qDebug() << "We are online.";
+    }
+
+    // Subscribe to system networking changes
+    QObject::connect(ns.data(),
+                     &Connectivity::statusUpdated,
+                     [](Connectivity::Status value)
+    {
+        switch(value) {
+        case Connectivity::Status::Offline:
+            qDebug() << "System networking status changed to: Offline";
+            break;
+        case Connectivity::Status::Connecting:
+            qDebug() << "System networking status changed to: Connecting";
+            break;
+        case Connectivity::Status::Online:
+            qDebug() << "System networking status changed to: Online";
+            break;
+        }
+    });
+    //! [status]
+
+    //! [limitations]
+    // normal getter
+    if (ns->limitations().isEmpty())
+        qDebug() << "No limitations";
+
+    // Subscribe to limitation changes
+    QObject::connect(ns.data(),
+                     &Connectivity::limitationsUpdated,
+                     [&ns](){
+        if (ns->limitations().isEmpty())
+        {
+            qDebug() << "No limitations.";
+            return;
+        }
+
+        qDebug() << "Limitations:";
+        if (ns->limitations().contains(Connectivity::Limitations::Bandwith))
+        {
+            qDebug() << "    - Bandwith";
+        }
+    });
+    //! [limitations]
+
+    app.exec();
+
+    return 0;
+}

=== added directory 'doc/qt/cpp/pages'
=== added file 'doc/qt/cpp/pages/mainpage.dox'
--- doc/qt/cpp/pages/mainpage.dox	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/pages/mainpage.dox	2015-05-13 10:12:45 +0000
@@ -0,0 +1,18 @@
+/*!
+\mainpage Ubuntu Connectivity API
+
+\tableofcontents
+
+\section sec_introduction Introduction
+
+Ubuntu Connectivity API offers a way to access the connectivity related information of the system.
+
+\section sec_general General Topics
+
+ - \ref using-cpp "Using this C++ API"
+ - \ref networking-status "Getting the networking status."
+
+\section sec_bug_reports Reporting Bugs
+If you find any problems with the or this documentation,
+please file a bug in Connectivity API [Launchpad page](https://bugs.launchpad.net/connectivity-api).
+*/

=== added file 'doc/qt/cpp/pages/networking-status.dox'
--- doc/qt/cpp/pages/networking-status.dox	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/pages/networking-status.dox	2015-05-13 10:12:45 +0000
@@ -0,0 +1,35 @@
+/*!
+\page networking-status Networking Status
+
+Applications needing to access the overall system networking status must access the
+ubuntu::connectivity::NetworkingStatus class. The class has properties
+for the networking status and connection limitations of the system networking.
+
+Accessing the networking status from confined applications requires
+the <i>connectivity</i> policy group.
+
+\section Setup
+
+Manager is accessed by including the appropriate header:
+\snippet example_networking_status.cpp include
+
+and then creating an instance of the NetworkingStatus:
+\snippet example_networking_status.cpp create networkingstatus
+
+\section sec_networking_status Networking Status
+
+\subsection sec_networking_status_status Status
+
+The status of the system networking can be accessed through the ubuntu::connectivity::NetworkingStatus::status property:
+\snippet example_networking_status.cpp status
+
+\subsection sec_networking_status_limitations Limitations
+
+The limitations can be accessed through the ubuntu::connectivity::NetworkingStatus::limitations property:
+\snippet example_networking_status.cpp limitations
+
+---
+The complete example (found in <i>examples/example_networking_status.cpp</i>):
+\include example_networking_status.cpp
+
+*/

=== added file 'doc/qt/cpp/pages/using.dox'
--- doc/qt/cpp/pages/using.dox	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/pages/using.dox	2015-05-13 10:12:45 +0000
@@ -0,0 +1,26 @@
+/*!
+\page using-cpp Using the C++ API
+
+Install the development headers:
+
+\code{.txt}
+sudo apt-get install libconnectivity-qt1-dev
+\endcode
+
+Enable c++11 and use pkg-config to get the necessary compilation flags:
+
+\code{.txt}
+$ g++ myapp.cpp -std=c++11 `pkg-config --cflags --libs connectivity-qt1` -o myapp
+\endcode
+
+The headers can then be included as:
+
+\code{.cpp}
+// includes the ubuntu::connectivity::NetworkingStatus class
+#include <ubuntu/connectivity/networking-status.h>
+\endcode
+
+<b>note:</b><br />
+Accessing the networking status from confined applications requires the <i>connectivity</i> policy group.
+
+*/

=== added file 'doc/qt/cpp/ubuntu-appdev-site-footer.html'
--- doc/qt/cpp/ubuntu-appdev-site-footer.html	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/ubuntu-appdev-site-footer.html	2015-05-13 10:12:45 +0000
@@ -0,0 +1,53 @@
+</div></div>
+<div class="shadow"></div>
+<footer>
+  <div>
+    <nav role="navigation" class="clearfix">
+      <ul>
+	<li><a href="/get-started">Get started</a></li>
+	<li class="page_item page-item-16"><a href="http://developer.ubuntu.com/get-started/quickly-workflow/">Quickly workflow</a></li>
+	<li class="page_item page-item-18"><a href="http://developer.ubuntu.com/get-started/qt-creator/">Qt Creator</a></li>
+	<li class="page_item page-item-20"><a href="http://developer.ubuntu.com/get-started/eclipse/">Eclipse</a></li>
+	<li class="page_item page-item-22"><a href="http://developer.ubuntu.com/get-started/monodevelop/">MonoDevelop</a></li>
+      </ul>
+      <ul>
+	<li><a href="/resources">Resources</a></li>
+	<li><a href="/resources/tools/quickly">Quickly</a></li>
+	<li><a href="/resources/platform/api">API</a></li>
+	<li><a href="/resources/platform/documentation/platform-diagram">Platform overview</a></li>
+      </ul>
+      <ul>
+	<li><a href="/publish">Publish</a></li>
+	<li class="page_item page-item-24"><a href="http://developer.ubuntu.com/publish/commercial-software-faqs/">Commercial software FAQs</a></li>
+	<li class="page_item page-item-34"><a href="http://developer.ubuntu.com/publish/application-states/">Application states</a></li>
+	<li class="page_item page-item-577"><a href="http://developer.ubuntu.com/publish/my-apps-packages/">Uploading your app</a></li>
+	<li class="page_item page-item-404"><a href="http://developer.ubuntu.com/publish/ubuntu-software-centre/">Ubuntu Software Centre</a></li>
+	<li class="page_item page-item-427"><a href="http://developer.ubuntu.com/publish/licence-key-infrastructure/">Licence key infrastructure</a></li>
+	<li class="page_item page-item-1230"><a href="http://developer.ubuntu.com/publish/updating-your-app/">Updating your app</a></li>
+      </ul>
+      <ul>
+	<li><a href="/community">Community</a></li>
+	<li class="page_item page-item-28"><a href="http://developer.ubuntu.com/community/app-developer-blog/">App Developer Blog</a></li>
+	<li class="page_item page-item-30"><a href="http://developer.ubuntu.com/community/submit-a-tutorial/">Submit a tutorial</a></li>
+	<li class="page_item page-item-32"><a href="http://developer.ubuntu.com/community/app-review-board-charter/">App Review Board charter</a></li>
+	<li class="page_item page-item-2987"><a href="http://developer.ubuntu.com/community/on-air/">On air</a>
+	  <ul class='children'>
+	<li class="page_item page-item-3066"><a href="http://developer.ubuntu.com/community/on-air/recordings/">Recordings</a></li>
+	  </ul>
+	</li>
+      </ul>
+      <ul class="last">
+	<li><a href="https://myapps.developer.ubuntu.com/dev">My Apps</a></li>
+	<li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li>
+	<li><a href="https://myapps.developer.ubuntu.com/dev/account">My account</a></li>
+      </ul>
+    </nav>
+    <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.
+      <a class="link-bug" href="https://bugs.launchpad.net/ubuntudeveloperportal/+filebug">
+	Report a bug on this site
+      </a>
+    </p>
+  </div>
+</footer>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+<script type="text/javascript" src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/js/base.js"></script>\n"

=== added file 'doc/qt/cpp/ubuntu-appdev-site-header.html'
--- doc/qt/cpp/ubuntu-appdev-site-header.html	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/ubuntu-appdev-site-header.html	2015-05-13 10:12:45 +0000
@@ -0,0 +1,35 @@
+<header>
+  <div class="header-login">
+    <ul>
+      <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next\=/dev">Sign in or register</a></li>
+    </ul>
+  </div>
+  <div class="header-navigation">
+    <div>
+      <nav role="navigation">
+	<ul>
+	  <li class="page_item page-item-5"><a href="http://developer.ubuntu.com/">Home</a></li>
+	  <li class="page_item page-item-7"><a href="http://developer.ubuntu.com/get-started/">Get started</a></li>
+	  <li class="page_item page-item-9"><a href="http://developer.ubuntu.com/resources/">Resources</a></li>
+	  <li class="page_item page-item-11"><a href="http://developer.ubuntu.com/publish/">Publish</a></li>
+	  <li class="page_item page-item-13"><a href="http://developer.ubuntu.com/community/">Community</a></li>
+	  <li><a href="https://myapps.developer.ubuntu.com/dev">My Apps</a></li>
+	  <li>
+	    <form id="form-search" method="get" action="/">
+	      <fieldset>
+		<input id="input-search" type="text" name="s" value="Search" />
+	      </fieldset>
+	    </form>
+	  </li>
+	</ul>
+      </nav>
+      <a class="logo-ubuntu" href="/"><img src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/logo-ubuntu.png" width="119" height="27" alt="Ubuntu logo" /></a>
+      <h2><a href="/">App Developer</a></h2>
+    </div>
+  </div>
+  
+</header>
+<div class="wrapper">
+  <div class="main-content">\n" 
+    
+    

=== added directory 'doc/qt/qml'
=== added file 'doc/qt/qml/CMakeLists.txt'
--- doc/qt/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,51 @@
+set(DOC_SOURCES
+    examples/example_networking_status.qml
+    qml-api/NetworkingStatus.qml
+    pages/mainpage.qdoc)
+
+# add a target to generate API documentation with qdoc
+FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
+
+if(QDOC_EXECUTABLE)
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/connectivity-qml.qdocconf.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/connectivity-qml.qdocconf"
+    @ONLY
+)
+
+add_custom_target(qmldoc
+    ALL
+    COMMAND "${QDOC_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/connectivity-qml.qdocconf"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+    COMMENT "Generating QML API documentation with qdoc" VERBATIM
+    DEPENDS ${DOC_SOURCES}
+)
+
+# copy stylesheet files into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/css"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# copy the API files over ot the build directery as there is a
+# bug in qt5.2 qdoc for handling absolute paths
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qml-api"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pages"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/examples"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+    DESTINATION ${INSTALL_DOCDIR}/qml/html/
+)
+
+endif(QDOC_EXECUTABLE)
+
+

=== added file 'doc/qt/qml/connectivity-qml.qdocconf.in'
--- doc/qt/qml/connectivity-qml.qdocconf.in	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/connectivity-qml.qdocconf.in	2015-05-13 10:12:45 +0000
@@ -0,0 +1,55 @@
+project = Connectivity
+description = Ubuntu Connectivity QML API
+version = CONNECTIVITY_QT_VERSION_MAJOR@.@CONNECTIVITY_QT_VERSION_MINOR@
+
+outputencoding = UTF-8
+sourceencoding = UTF-8
+
+# Bug in Qt5.2 qdoc, does not support absolute paths
+# just have to hack this over and copy the files to BINARY_DIR
+#sourcedirs = @CMAKE_CURRENT_SOURCE_DIR@/pages @CMAKE_CURRENT_SOURCE_DIR@/qml-api
+#exampledirs = @CMAKE_SOURCE_DIR@/examples/
+#imagedirs = @CMAKE_CURRENT_SOURCE_DIR@/../images
+sourcedirs = pages qml-api
+exampledirs = examples/
+
+sources.fileextensions = "*.qdoc *.qml"
+headers.fileextensions = "*.h"
+examples.fileextensions = "*.js *.qml"
+examples.imageextensions = "*.png *.jpeg *.jpg"
+
+outputdir = @CMAKE_CURRENT_BINARY_DIR@/html
+outputformat = HTML
+
+outputprefixes = QML
+outputprefixes.QML = qml-
+
+HTML.templatedir = @CMAKE_CURRENT_SOURCE_DIR@/
+HTML.nobreadcrumbs = "true"
+		   
+HTML.stylesheets = \
+    css/reset.css \
+    css/qtquick.css \
+    css/base.css \
+    css/scratch.css
+
+HTML.headerstyles = \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/reset.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtquick.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\n" \
+  "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/scratch.css\" />\n"
+
+HTML.postheader = \
+    "   <div class=\"wrapper\">\n" \
+    "   <div class=\"main-content\">\n" 
+
+HTML.footer = \
+    "</div></div>\n" \
+    "<div class=\"shadow\"></div>\n" \
+    "<footer>\n" \
+    "	<div>\n" \
+    "		<nav role=\"navigation\" class=\"clearfix\">\n" \
+    "		</nav>\n" \
+    "		<p>&copy; 2014 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>\n" \
+    "	</div>\n" \
+    "</footer>\n"

=== added directory 'doc/qt/qml/css'
=== added file 'doc/qt/qml/css/base.css'
--- doc/qt/qml/css/base.css	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/css/base.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,638 @@
+/**
+* Ubuntu Developer base stylesheet
+*
+* A base stylesheet containing site-wide styles
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards
+* @copyright 2011 Canonical Ltd.
+*/
+
+/**
+* @section Global
+*/
+
+body {
+	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+	font-size: 13px;
+	line-height: 1.4;
+	color: #333;
+}
+a {
+	color: #dd4814;
+	text-decoration: none;
+	outline: 0;
+}
+p, dl {
+	margin-bottom: 10px;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+code{
+	padding: 10px;
+	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
+	background-color: #fdf6f2;
+	display: block;
+	margin-bottom: 10px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+h1 {
+	font-size: 36px;
+	line-height: 1.1;
+	margin-bottom: 20px;
+}
+article h1,
+h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin-bottom: 14px;
+}
+h3 {
+	font-size: 16px;
+	line-height: 1.3;
+	margin-bottom: 8px;
+}
+h4 {
+	font-weight: bold;
+}
+
+time {
+	color:#999;
+}
+
+/**
+* @section Structure
+*/
+
+.header-login,
+.header-navigation div,
+.header-content div {
+	margin: 0 auto;
+	width: 940px;
+}
+
+.header-content h1{
+	background-color:#ffffff;
+	display:inline-block;
+}
+
+.header-content h2{
+	background-color:#ffffff;
+	display:table;
+}
+
+.header-login ul {
+	margin: 4px 0;
+	float: right;
+}
+.header-login li {
+	margin-right: 10px;
+	float: left;
+}
+.header-login a {
+	color: #333;
+}
+.header-navigation {
+	border-top: 2px solid #dd4814;
+	border-bottom: 2px solid #dd4814;
+	background-color: #fff;
+	height: 54px;
+	clear: right;
+	overflow: hidden;
+}
+.header-navigation nav ul {
+	border-right: 1px solid #dd4814;
+	float: right;
+}
+.header-navigation nav li {
+	border-left: 1px solid #dd4814;
+	float: left;
+	height: 54px;
+}
+.header-navigation nav a {
+	padding: 18px 14px 0;
+	font-size: 14px;
+	display: block;
+	height: 36px;
+}
+.header-navigation nav a:hover {
+	background-color: #fcece7;
+}
+.header-navigation nav .current_page_item a,
+.header-navigation nav .current_page_parent a,
+.header-navigation nav .current_page_ancestor a {
+	background-color: #dd4814;
+	color: #fff;
+}
+.header-navigation input {
+	margin: 12px 10px 0 10px;
+	padding: 5px;
+	border-top: 1px solid #a1a1a1;
+	border-right: 1px solid #e0e0e0;
+	border-bottom: 1px solid #fff;
+	border-left: 1px solid #e0e0e0;
+	width: 90px;
+	font-style: italic;
+	color: #ccc;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+	border-radius: 3px;
+		-moz-box-shadow: inset 0 1px 1px #e0e0e0;
+	   -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
+   box-shadow: inset 0 1px 1px #e0e0e0;
+}
+.header-navigation h2 {
+	margin: 18px 0 0 6px;
+	text-transform: lowercase;
+	font-size: 22px;
+	color: #dd4814;
+	float: left;
+}
+.header-navigation .logo-ubuntu {
+	margin-top: 12px;
+	float: left;
+}
+.header-content .header-navigation-secondary {
+	margin-bottom: 40px;
+	padding: 0;
+	position: relative;
+	z-index: 2;
+}
+.header-navigation-secondary div {
+	padding: 0;
+	border: 2px solid #dd4814;
+		-moz-border-radius: 0px 0px 4px 4px;
+		-webkit-border-radius: 0px 0px 4px 4px;
+	border-radius: 0px 0px 4px 4px;
+	background: #fff;
+	border-top: 0px;
+	width: 936px;
+}
+.header-navigation-secondary nav li {
+	float: left;
+}
+.header-navigation-secondary nav li a {
+	color: #333;
+	display: block;
+	height: 25px;
+	padding: 8px 8px 0;
+}
+.header-navigation-secondary nav li:hover,
+.header-navigation-secondary nav .current_page_item a {
+	background: url("../img/sec-nav-hover.gif");
+}
+.header-content {
+	padding-bottom: 30px;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 1px 3px #e0e0e0;
+		-webkit-box-shadow: 0 1px 3px #e0e0e0;
+	box-shadow: 0 1px 3px #e0e0e0;
+	margin-bottom: 3px;
+	position: relative;
+	overflow: hidden;
+}
+footer {
+	padding: 10px 10px 40px 10px;
+	position: relative;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+	font-size: 12px;
+	background: url("../img/background-footer.png") repeat scroll 0 0 #f7f6f5;
+}
+footer div {
+	margin: 0 auto;
+    padding: 0 10px;
+    width: 940px;
+}
+footer a {
+	color: #000;
+}
+footer nav ul {
+	margin: 10px 17px 30px 0;
+	width: 172px;
+	display: inline-block;
+	vertical-align: top;
+	height: auto;
+	zoom: 1;
+	*display: inline;
+}
+footer nav ul.last {
+	margin-right: 0;
+}
+footer nav li {
+	margin-bottom: 8px;
+}
+footer nav li:first-child {
+	font-weight: bold;
+}
+footer p {
+	margin-bottom: 0;
+}
+#content {
+	padding-top: 35px;
+}
+.arrow-nav {
+	display: none;
+	position: absolute;
+	top: -1px;
+	z-index: 3;
+}
+.shadow {
+	margin: 30px 0 3px 0;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 2px 3px #e0e0e0;
+		-webkit-box-shadow: 0 2px 3px #e0e0e0;
+	box-shadow: 0 2px 3px #e0e0e0;
+	height: 3px;
+}
+
+/**
+* @section Site-wide
+*/
+
+#content h2{
+	font-size:24px;
+}
+
+.box-orange {
+	padding: 10px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-orange .link-action-small {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.link-bug {
+	margin-left: 10px;
+	color: #999;
+}
+.link-action {
+	float: left;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.link-action2 {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+	line-height: 1.3;
+}
+.link-action2 span{
+	display:block;
+	float:left;
+}
+.link-action2 .cta-left{
+	background:url(../img/button-cta-left.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+.link-action2 .cta-center{
+	background:url(../img/button-cta-slice.png) repeat-x;
+	line-height:45px;
+	height:48px;
+}
+.link-action2 .cta-right{
+	background:url(../img/button-cta-right.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+
+.link-action-small {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+}
+.link-action-small span{
+	display:block;
+	float:left;
+	height:42px;
+}
+.link-action-small .cta-left{
+	background:url(../img/button-cta-left-small.png) no-repeat;
+	width:19px;
+}
+.link-action-small .cta-center{
+	background:url(../img/button-cta-slice-small.png) repeat-x;
+	line-height:42px;
+}
+.link-action-small .cta-right{
+	background:url(../img/button-cta-right-small.png) no-repeat;
+	width:19px;
+}
+
+.link-action:active {
+	position: relative;
+	top: 1px;
+}
+.link-action2:active {
+	position: relative;
+	top: 1px;
+}
+.link-action-small:active {
+	position: relative;
+	top: 1px;
+}
+.list-bullets li {
+	margin-bottom: 10px;
+	list-style: disc;
+	list-style-position: inside;
+}
+.box {
+	margin-bottom: 30px;
+	padding: 15px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-padded {
+	margin-bottom: 30px;
+	padding: 5px;
+	border: 2px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background: url("../img/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
+	overflow: hidden;
+}
+.box-padded h3 {
+	 margin: 5px 0 10px 5px;
+}
+.box-padded div {
+	padding: 10px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: #fff;
+	overflow: hidden;
+}
+.box-padded li {
+	padding: 0 10px;
+	float: left;
+	width: 211px;
+	border-right: 1px dotted #aea79f;
+}
+.box-padded li.first {
+	padding: 0;
+	margin-bottom: 0;
+}
+.box-padded li.last {
+	border: 0;
+	width: 217px;
+}
+.box-padded img {
+	margin: 0 10px 50px 0;
+	float: left;
+		-moz-border-radius: 8px;
+		-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+.box-clear {
+	margin-bottom: 40px;
+}
+.box-clear .grid-4.first {
+	margin-right: 15px;
+	padding-right: 15px;
+}
+.box-clear .grid-4 {
+	margin-left: 0;
+	margin-right: 10px;
+	padding-right: 10px;
+	width: 298px;
+}
+.box-clear time {
+	display: block;
+	border-bottom: 1px dotted #aea79f;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+.box-clear div.first {
+	border-right: 1px dotted #aea79f;
+}
+.box-clear a {
+	display: block;
+}
+.box-clear .rss {
+	background: url("../img/rss.jpg") no-repeat scroll 0 center;
+	padding-left: 20px;
+}
+.box-clear .location {
+	display: block;
+	margin-bottom: 1px;
+}
+.box-clear .last {
+	margin: 0;
+	padding-right: 0;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: 293px;
+}
+
+/* Widgets */
+
+.ui-state-focus {
+	outline: none;
+}
+.ui-accordion {
+	border-bottom: 1px dotted #aea79f;
+}
+.ui-accordion a {
+	display: block;
+}
+.ui-accordion h3 {
+	margin-bottom: 0;
+	border-top: 1px dotted #aea79f;
+	position: relative;
+	font-size: 13px;
+	font-weight: bold;
+}
+.ui-accordion h3 a {
+	padding: 10px 0;
+	color: #333;
+}
+.ui-accordion h4 {
+	margin-bottom: 5px;
+}
+.ui-accordion div fieldset {
+	padding-bottom: 5px;
+}
+.ui-accordion div li,
+.ui-accordion div input {
+	margin-bottom: 10px;
+}
+.ui-accordion .ui-icon {
+	position: absolute;
+	top: 15px;
+	right: 0;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background: url("../img/icon-accordion-inactive.png") 0 0 no-repeat transparent;
+}
+.ui-accordion .ui-state-active .ui-icon {
+	background-image: url("../img/icon-accordion-active.png");
+}
+.ui-accordion .current_page_item a {
+	color: #333;
+}
+.container-tweet {
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	padding: 10px 10px 10px;
+	background-color: #f7f7f7;
+}
+.container-tweet .tweet-follow {
+	margin-top: 10px;
+	margin-bottom: -10px;
+	padding-left: 55px;
+	padding-bottom: 6px;
+	background: url("../img/tweet-follow.png") 0 5px no-repeat;
+	display: block;
+}
+.container-tweet .tweet-follow span {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.2;
+	display: block;
+}
+.tweet a {
+	display: inline;
+}
+.tweet .tweet_text {
+	padding: 10px;
+	background-color: #fff;
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	border: 1px solid #dd4814;
+	font-size: 16px;
+	display: block;
+	clear: both;
+}
+.tweet.tweet-small .tweet_text {
+	font-size: inherit;
+}
+.tweet .tweet_text a {
+	color: #333;
+}
+.tweet .tweet_time,
+.tweet .tweet_user_and_time {
+	padding: 15px 0 10px 0;
+	position: relative;
+	top: -2px;
+	background: url("../img/tweet-arrow.png") no-repeat;
+	display: block;
+}
+.tweet .tweet_odd .tweet_time,
+.tweet .tweet_odd .tweet_user_and_time {
+	background-position: right 0;
+	float: right;
+}
+.tweet .tweet_even .tweet_time,
+.tweet .tweet_even .tweet_user_and_time {
+	background-position: left 0;
+	float: left;
+}
+
+/* Search */
+
+#content .list-search li {
+	list-style-type:none;
+	border:0px;
+	margin-bottom: 15px;
+	padding-top: 15px;
+}
+
+/* Blog */
+
+.blog-article #nav-single {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+.blog-article #nav-single .nav-next {
+	float: right;
+}
+.blog-article article header .entry-meta {
+	margin-bottom: 20px;
+}
+.blog-article article .entry-meta {
+	color: #999;
+}
+.blog-article #respond form input[type="submit"] {
+	float: left;
+	cursor: pointer;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-left: 3px solid #e6633a;
+	border-right: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.blog-article #respond form input[type="submit"]:active {
+	position: relative;
+	top: 1px;
+}
+
+.alignnone{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignleft{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignright{
+    float:right;
+   margin:10px 0 10px 20px;
+}
+
+.aligncenter{
+	float:left;
+    margin:10px 20px 10px 0;
+}
+.entry-content h2, .entry-content h3{
+    margin-top:20px;
+}
+.entry-content ul li{
+    list-style-type: circle;
+    margin-left:16px;
+}
+
+.entry-content hr{
+	border:none;
+	border-top: 1px dotted #AEA79F;
+}

=== added file 'doc/qt/qml/css/qtquick.css'
--- doc/qt/qml/css/qtquick.css	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/css/qtquick.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,772 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    ul li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1.title
+    {
+        font-weight: bold;
+        font-size: 150%;
+    }
+    h0
+    {
+        font-weight: bold;
+        font-size: 130%;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin: 0 1.5em 0 1.5em;
+        font-family: ubuntu;
+        line-height: normal
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 1em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: black;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #202020;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-left: 5px;
+        margin-top: 5px;
+        margin-bottom: 0.5em;
+    }
+
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 130%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 110%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .toc
+    {
+        font-size: 80%
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
+
+
+/* modify the TOC layouts */
+div.toc ul {
+    padding-left: 20px;
+}
+div.toc li {
+    padding-left: 4px;
+}
+/* Remove the border around images*/
+a img
+{
+    border:none;
+}
+
+/*Add styling to the front pages*/
+
+.threecolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.threecolumn_piece
+{
+    display: inline-block;
+    margin-left: 78px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 25.5%;
+}
+div.threecolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.threecolumn_piece p {
+    margin-bottom: 7px;
+    color: #5C626E;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.threecolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.threecolumn_piece a {
+    font-weight: normal;
+}
+/* Add style to guide page*/
+.fourcolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.fourcolumn_piece
+{
+    display: inline-block;
+    margin-left: 35px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 21.3%;
+}
+div.fourcolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.fourcolumn_piece p {
+    margin-bottom: 7px;
+    color: #40444D;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.fourcolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.fourcolumn_piece a {
+    font-weight: normal;
+}

=== added file 'doc/qt/qml/css/reset.css'
--- doc/qt/qml/css/reset.css	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/css/reset.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file

=== added file 'doc/qt/qml/css/scratch.css'
--- doc/qt/qml/css/scratch.css	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/css/scratch.css	2015-05-13 10:12:45 +0000
@@ -0,0 +1,61 @@
+body {
+	margin: 0;
+}
+
+
+div.toc ul {
+	padding: 0;
+}
+
+div.toc li {
+	margin-bottom: 3px;
+}
+
+h1.title {
+	font-size: 36px;
+	line-height: 1.1;
+	font-weight: normal;
+}
+h0, h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin: 14px 0;
+	font-weight: normal;
+	display: block;
+}
+a:hover {
+	color: #dd4814;
+	text-decoration: underline;
+	outline: 0;
+}
+table, pre {
+	border-radius: 0;
+}
+
+.annotated td {
+	padding: 0.8em 1em 0.3em;
+}
+.wrapper {
+	width: 940px;
+	margin: 0 auto;
+}
+.main-content {
+	width: 668px;
+	position: relative;
+	left: 270px;
+}
+.title {
+	margin-left: -270px;
+	margin-top: 30px;
+	margin-bottom: 50px;
+}
+.toc {
+	margin-left: -270px;
+	font-size: 100%;
+	margin-bottom: 40px;
+    padding: 0;
+    z-index: 2;
+    position: absolute;
+    top: 100px;
+    width: 250px;
+}

=== added directory 'doc/qt/qml/examples'
=== added file 'doc/qt/qml/examples/example_networking_status.qml'
--- doc/qt/qml/examples/example_networking_status.qml	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/examples/example_networking_status.qml	2015-05-13 10:12:45 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Connectivity 1.0
+
+MainView {
+    id: root
+    objectName: "mainView"
+    applicationName: "NetworkingStatus"
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    property real margins: units.gu(2)
+    property real buttonWidth: units.gu(9)
+
+    Connections {
+        target: NetworkingStatus
+
+        // full status can be retrieved from the base C++ class
+        // status property
+        onStatusChanged: {
+            if (status === NetworkingStatus.Offline)
+                console.log("Status: Offline")
+            if (status === NetworkingStatus.Connecting)
+                console.log("Status: Connecting")
+            if (status === NetworkingStatus.Online)
+                console.log("Status: Online")
+        }
+    }
+
+    Page {
+        title: i18n.tr("Networking Status")
+
+        Column {
+            anchors.centerIn: parent
+            Label {
+                // use the online property
+                text: NetworkingStatus.online ? "Online" : "Not online"
+                fontSize: "large"
+            }
+            Label {
+                // use the limitedBandwith property
+                text: NetworkingStatus.limitedBandwith ? "Bandwith limited" : "Bandwith not limited"
+                fontSize: "large"
+            }
+        }
+    }
+}

=== added directory 'doc/qt/qml/pages'
=== added file 'doc/qt/qml/pages/mainpage.qdoc'
--- doc/qt/qml/pages/mainpage.qdoc	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/pages/mainpage.qdoc	2015-05-13 10:12:45 +0000
@@ -0,0 +1,25 @@
+/*!
+\page index.html overview
+\title Ubuntu Connectivity API
+
+\contentspage {Ubuntu Connectivity API} {Contents}
+
+\part Introduction
+
+Ubuntu Connectivity API offers a way to access the connectivity related information of the system.
+Qt C++ API version of this API also exists (see the C++ documentation).
+
+\part Components
+Available through:
+\code
+    import Ubuntu.Connectivity 1.0
+\endcode
+
+\part Items
+\annotatedlist connectivity
+
+\part Reporting Bugs
+If you find any problems with the or this documentation,
+please file a bug in Connectivity API \l {https://bugs.launchpad.net/connectivity-api} {Launchpad page}.
+
+*/

=== added directory 'doc/qt/qml/qml-api'
=== added file 'doc/qt/qml/qml-api/NetworkingStatus.qml'
--- doc/qt/qml/qml-api/NetworkingStatus.qml	1970-01-01 00:00:00 +0000
+++ doc/qt/qml/qml-api/NetworkingStatus.qml	2015-05-13 10:12:45 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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 QtQuick 2.0
+
+/*!
+ \qmltype NetworkingStatus
+ \ingroup connectivity
+ \brief Overall system networking status.
+
+ This is the top-level class for accessing networking information.
+
+ This class inherits the Qt C++ ubuntu::connectivity::NetworkingStatus
+ and provides two utility properties online and limitedBandwith for easier
+ QML usage.
+
+ This object is exposed as a singleton.
+
+ \b{note:}
+ Using this component in confined application requires \e{connectivity} policy group.
+
+ \quotefile example_networking_status.qml
+ */
+
+QtObject {
+
+    /*!
+       \qmlproperty bool NetworkingStatus::online
+       \b{true} if system has Internet connection.
+
+       shorthand for C++:
+       \code
+           networkingStatus->status() == NetworkingStatus::Online
+       \endcode
+     */
+    property bool online
+
+    /*!
+       \qmlproperty bool NetworkingStatus::limitedBandwith
+       \b{true} if Internet connection is bandwith limited.
+
+       shorthand for C++:
+       \code
+           networkingStatus->limitations().contains(NetworkingStatus::Limitations::Bandwith)
+       \endcode
+     */
+    property bool limitedBandwith
+
+    /*!
+       \qmlproperty list<Limitations> NetworkingStatus::limitations
+     */
+    property list<Limitations> limitations
+
+    /*!
+       \qmlproperty NetworkingStatus::Status status
+       status property of the base C++ class.
+
+       \code
+       onStatusChanged: {
+           if (status === NetworkingStatus::Offline)
+               ;
+           else if (status === NetworkingStatus::Connecting)
+               ;
+           else if (status === NetworkingStatus::Online)
+               ;
+       }
+       \endcode
+     */
+    property Status status
+}

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-05-21 17:04:23 +0000
+++ po/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -1,33 +1,13 @@
-cmake_minimum_required(VERSION 2.8.9)
-find_package(Gettext REQUIRED)
-
-set(POT_FILE
-  indicator-network.pot
-)
-
-file(GLOB PO_FILES
-  *.po
-)
-
-set(MO_FILE indicator-network.mo)
-
-foreach(_file ${PO_FILES})
-  get_filename_component(_lang ${_file} NAME_WE)
-  set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
-  add_custom_command(OUTPUT ${_gmoFile}
-    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_file}
-    COMMAND install -D ${_gmoFile} ${CMAKE_CURRENT_BINARY_DIR}/locale/${_lang}/LC_MESSAGES/${MO_FILE}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    DEPENDS ${_file}
-  )
-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale/${_lang}/LC_MESSAGES/ RENAME ${MO_FILE})
-  _gettext_get_unique_target_name( pofiles uniqueTargetName)
-  add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFile})
-endforeach(_file)
-
-add_custom_command(OUTPUT ${POT_FILE}
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update-indicator-network-pot
-)
-add_custom_target(pot_file
-  DEPENDS ${POT_FILE}
-)
+find_package(Intltool REQUIRED)
+
+intltool_update_potfile(
+    KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+    COPYRIGHT_HOLDER "Canonical Ltd."
+)
+
+intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)
+

=== removed file 'po/update-indicator-network-pot'
--- po/update-indicator-network-pot	2014-05-21 17:04:23 +0000
+++ po/update-indicator-network-pot	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-cd $(dirname $0)
-PO_DIR=$PWD
-
-PROGNAME=$(basename $0)
-
-# Create a list of files to scan
-GETTEXT_FILES=$(mktemp --tmpdir indicator-network.lst.XXXXX)
-trap 'rm -f "$GETTEXT_FILES"' EXIT
-cd ..
-find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
-    -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './.bzr/*' \) | sort \
-> $GETTEXT_FILES
-
-# Generate pot from our list
-xgettext \
-    --output $PO_DIR/indicator-network.pot \
-    --files-from $GETTEXT_FILES \
-    --qt --c++ \
-    --keyword=_ \
-    --from-code=UTF-8 \
-    --add-comments=TRANSLATORS \
-    --package-name="indicator-network" \
-    --copyright-holder="Canonical Ltd."
-
-echo "$PROGNAME: $PO_DIR/auto-generated.pot updated"

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-04-21 10:59:52 +0000
+++ src/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -1,8 +1,4 @@
 
-if(NOT build_type_lower MATCHES debug)
-    set(COMMON_FLAGS "${COMMON_FLAGS} -Werror")
-endif()
-
 add_subdirectory(connectivity-api)
 
 add_subdirectory(indicator)

=== modified file 'src/connectivity-api/connectivity-qml/CMakeLists.txt'
--- src/connectivity-api/connectivity-qml/CMakeLists.txt	2015-04-21 10:59:52 +0000
+++ src/connectivity-api/connectivity-qml/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -0,0 +1,33 @@
+ 
+include(QmlPlugins)
+
+find_package(Qt5Quick REQUIRED)
+
+include_directories(
+  "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
+)
+
+set(CONNECTIVITY_QML_SRC
+  plugin.cpp
+)
+
+add_library(connectivity-qml MODULE
+  ${CONNECTIVITY_QML_SRC}
+)
+
+qt5_use_modules(connectivity-qml
+  Qml
+)
+
+target_link_libraries(
+  connectivity-qml
+  connectivity-qt
+)
+
+add_qmlplugin(
+  Ubuntu.Connectivity
+  1.0
+  Ubuntu/Connectivity
+  TARGET_PREFIX Connectivity
+  TARGETS connectivity-qml
+)

=== added file 'src/connectivity-api/connectivity-qml/plugin.cpp'
--- src/connectivity-api/connectivity-qml/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qml/plugin.cpp	2015-05-13 10:12:45 +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 <plugin.h>
+#include <connectivityqt/connectivity.h>
+
+#include <QtQml>
+
+namespace
+{
+static QObject *
+connectivitySingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(scriptEngine)
+
+    return new connectivityqt::Connectivity(QDBusConnection::sessionBus(), engine);
+}
+}
+
+void
+QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
+{
+    connectivityqt::Connectivity::registerMetaTypes();
+    qmlRegisterSingletonType<connectivityqt::Connectivity>(uri, 1, 0, "NetworkingStatus", connectivitySingletonProvider);
+    qmlRegisterSingletonType<connectivityqt::Connectivity>(uri, 1, 0, "Connectivity", connectivitySingletonProvider);
+}
+
+void
+QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_UNUSED(uri);
+    Q_UNUSED(engine);
+}
+
+

=== added file 'src/connectivity-api/connectivity-qml/plugin.h'
--- src/connectivity-api/connectivity-qml/plugin.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qml/plugin.h	2015-05-13 10:12:45 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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]>
+ */
+
+#pragma once
+
+#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);
+};
+

=== added file 'src/connectivity-api/connectivity-qml/qmldir'
--- src/connectivity-api/connectivity-qml/qmldir	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qml/qmldir	2015-05-13 10:12:45 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Connectivity
+plugin connectivity-qml

=== modified file 'src/connectivity-api/connectivity-qt/CMakeLists.txt'
--- src/connectivity-api/connectivity-qt/CMakeLists.txt	2015-04-21 10:59:52 +0000
+++ src/connectivity-api/connectivity-qt/CMakeLists.txt	2015-05-13 10:12:45 +0000
@@ -1,10 +1,15 @@
 
+set(API_VERSION 1)
+set(SOVERSION 1)
+set(SYMBOL_MAP "${DATA_DIR}/connectivity-qt.map")
+set(OUTPUT_NAME "connectivity-qt${SOVERSION}")
 include_directories("${CMAKE_SOURCE_DIR}/src/qdbus-stubs")
 
 set(
     CONNECTIVITY_QT_SRC
     connectivityqt/internal/dbus-property-cache.cpp
     connectivityqt/connectivity.cpp
+    ubuntu/connectivity/networking-status.cpp
 )
 
 set_source_files_properties(
@@ -50,3 +55,26 @@
     connectivity-qt
     qdbus-stubs
 )
+
+set_target_properties(
+    connectivity-qt
+    PROPERTIES
+    OUTPUT_NAME ${OUTPUT_NAME}
+    VERSION ${API_VERSION}.0.0
+    SOVERSION ${SOVERSION}
+    LINK_FLAGS "-Wl,--version-script,${SYMBOL_MAP}"
+    LINK_DEPENDS "${SYMBOL_MAP}"
+)
+
+install(
+    TARGETS connectivity-qt
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DESTINATION "include"
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN "internal" EXCLUDE
+)
+

=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2015-04-23 10:02:23 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2015-05-13 10:12:45 +0000
@@ -49,6 +49,41 @@
 
     shared_ptr<ComUbuntuConnectivity1PrivateInterface> m_writeInterface;
 
+    static QVector<Limitations> toLimitations(const QVariant& value)
+    {
+        auto l = value.toStringList();
+        QVector<Limitations> result;
+        for (const auto& limit : l)
+        {
+            // FIXME KNOWN TYPO
+            if (limit == "bandwith")
+            {
+                result.push_back(Limitations::Bandwith);
+            }
+        }
+        return result;
+    }
+
+    static Status toStatus(const QVariant& value)
+    {
+        auto s = value.toString();
+
+        if (s == "offline")
+        {
+            return Status::Offline;
+        }
+        else if (s == "connecting")
+        {
+            return Status::Connecting;
+        }
+        else if (s == "online")
+        {
+            return Status::Online;
+        }
+
+        return Status::Offline;
+    }
+
 public Q_SLOTS:
 
     void propertyChanged(const QString& name, const QVariant& value)
@@ -65,11 +100,32 @@
         {
             Q_EMIT p.unstoppableOperationHappeningUpdated(value.toBool());
         }
+        else if (name == "Limitations")
+        {
+            auto limitations = toLimitations(value);
+            Q_EMIT p.limitationsUpdated(limitations);
+            Q_EMIT p.limitedBandwithUpdated(limitations.contains(Limitations::Bandwith));
+        }
+        else if (name == "Status")
+        {
+            auto status = toStatus(value);
+            Q_EMIT p.statusUpdated(status);
+            Q_EMIT p.onlineUpdated(status == Status::Online);
+        }
     }
 };
 
-Connectivity::Connectivity(const QDBusConnection& sessionConnection) :
-        d(new Priv(*this, sessionConnection))
+void Connectivity::registerMetaTypes()
+{
+    DBusTypes::registerMetaTypes();
+
+    qRegisterMetaType<connectivityqt::Connectivity::Limitations>("connectivityqt::Connectivity::Limitations");
+    qRegisterMetaType<QVector<connectivityqt::Connectivity::Limitations>>("QVector<connectivityqt::Connectivity::Limitations>");
+    qRegisterMetaType<connectivityqt::Connectivity::Status>("connectivityqt::Connectivity::Status");
+}
+
+Connectivity::Connectivity(const QDBusConnection& sessionConnection, QObject* parent) :
+        QObject(parent), d(new Priv(*this, sessionConnection))
 {
     d->m_readInterface = make_shared<
             ComUbuntuConnectivity1NetworkingStatusInterface>(
@@ -110,6 +166,31 @@
     return d->m_propertyCache->get("UnstoppableOperationHappening").toBool();
 }
 
+QVector<Connectivity::Limitations> Connectivity::limitations() const
+{
+    return d->toLimitations(d->m_propertyCache->get("Limitations"));
+}
+
+Connectivity::Status Connectivity::status() const
+{
+    return d->toStatus(d->m_propertyCache->get("Status"));
+}
+
+bool Connectivity::online() const
+{
+    return (status() ==  Status::Online);
+}
+
+bool Connectivity::limitedBandwith() const
+{
+    return limitations().contains(Limitations::Bandwith);
+}
+
+bool Connectivity::isInitialized() const
+{
+    return d->m_propertyCache->isInitialized();
+}
+
 void Connectivity::setFlightMode(bool enabled)
 {
     d->m_writeInterface->SetFlightMode(enabled);
@@ -120,11 +201,6 @@
     d->m_writeInterface->SetWifiEnabled(enabled);
 }
 
-bool Connectivity::isInitialized() const
-{
-    return d->m_propertyCache->isInitialized();
-}
-
 }
 
 #include "connectivity.moc"

=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2015-04-23 10:02:23 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2015-05-13 10:12:45 +0000
@@ -36,18 +36,57 @@
 public:
     UNITY_DEFINES_PTRS(Connectivity);
 
-    Connectivity(const QDBusConnection& sessionConnection = QDBusConnection::sessionBus());
+    Q_DISABLE_COPY(Connectivity)
+
+    Q_ENUMS(Limitations)
+    Q_ENUMS(Status)
+
+    static void registerMetaTypes();
+
+    /**
+      * @brief enum for networking limitations
+      *
+      * Networking limitations may be accessed through the NetworkingStatus::limitations property.
+      */
+    enum class Limitations
+    {
+        /**
+         * indicates that the bandwith of the Internet connection has limitations.
+         * Applications should minimize their bandwith usage if possible.
+         */
+        Bandwith
+    };
+
+    /**
+      * @brief enum for networking status
+      *
+      * Networking status may be accessed through the NetworkingStatus::status property.
+      */
+    enum class Status
+    {
+        Offline,     /**< No Internet connection available.            */
+        Connecting,  /**< System is actively establising a connection. */
+        Online       /**< System is connected to the Internet.         */
+    };
+
+    Connectivity(const QDBusConnection& sessionConnection = QDBusConnection::sessionBus(), QObject* parent = 0);
 
     ~Connectivity();
 
     Q_PROPERTY(bool FlightMode READ flightMode WRITE setFlightMode NOTIFY flightModeUpdated)
     bool flightMode() const;
 
-//    Q_PROPERTY(QStringList Limitations READ limitations NOTIFY limitationsUpdated)
-//    QStringList limitations() const;
-
-//    Q_PROPERTY(QString Status READ status NOTIFY statusUpdated)
-//    QString status() const;
+    Q_PROPERTY(bool online READ online NOTIFY onlineUpdated)
+    bool online() const;
+
+    Q_PROPERTY(bool limitedBandwith READ limitedBandwith NOTIFY limitedBandwithUpdated)
+    bool limitedBandwith() const;
+
+    Q_PROPERTY(QVector<Limitations> Limitations READ limitations NOTIFY limitationsUpdated)
+    QVector<Limitations> limitations() const;
+
+    Q_PROPERTY(connectivityqt::Connectivity::Status Status READ status NOTIFY statusUpdated)
+    Status status() const;
 
     Q_PROPERTY(bool WifiEnabled READ wifiEnabled WRITE setwifiEnabled NOTIFY wifiEnabledUpdated)
     bool wifiEnabled() const;
@@ -66,9 +105,13 @@
 Q_SIGNALS:
     void flightModeUpdated(bool);
 
-//    void limitationsUpdated(const QStringList&);
-
-//    void statusUpdated(const QString&);
+    void onlineUpdated(bool value);
+
+    void limitedBandwithUpdated(bool value);
+
+    void limitationsUpdated(const QVector<Limitations>&);
+
+    void statusUpdated(connectivityqt::Connectivity::Status value);
 
     void wifiEnabledUpdated(bool);
 
@@ -82,3 +125,8 @@
 };
 
 }
+
+Q_DECLARE_METATYPE(connectivityqt::Connectivity::Limitations)
+Q_DECLARE_METATYPE(QVector<connectivityqt::Connectivity::Limitations>)
+Q_DECLARE_METATYPE(connectivityqt::Connectivity::Status)
+

=== added directory 'src/connectivity-api/connectivity-qt/ubuntu'
=== added directory 'src/connectivity-api/connectivity-qt/ubuntu/connectivity'
=== added file 'src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.cpp'
--- src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.cpp	2015-05-13 10:12:45 +0000
@@ -0,0 +1,100 @@
+/*
+ * 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/networking-status.h>
+#include <connectivityqt/connectivity.h>
+
+#include <QDebug>
+
+using namespace std;
+
+namespace ubuntu
+{
+namespace connectivity
+{
+
+class Q_DECL_HIDDEN NetworkingStatus::Private: public QObject
+{
+    Q_OBJECT
+
+public:
+    NetworkingStatus& p;
+
+    connectivityqt::Connectivity::SPtr m_connectivity;
+
+    Private(NetworkingStatus& parent) :
+        p(parent)
+    {
+        m_connectivity = make_shared<connectivityqt::Connectivity>();
+
+        connect(m_connectivity.get(),
+                &connectivityqt::Connectivity::limitationsUpdated, this,
+                &Private::limitationsUpdated);
+
+        connect(m_connectivity.get(),
+                &connectivityqt::Connectivity::statusUpdated, this,
+                &Private::statusUpdated);
+    }
+
+public Q_SLOTS:
+    void limitationsUpdated(const QVector<connectivityqt::Connectivity::Limitations>&)
+    {
+        Q_EMIT p.limitationsChanged();
+    }
+
+    void statusUpdated(connectivityqt::Connectivity::Status value)
+    {
+        Q_EMIT p.statusChanged(static_cast<NetworkingStatus::Status>(value));
+    }
+};
+
+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
+{
+    QVector<NetworkingStatus::Limitations> result;
+    for (const auto& limitation : d->m_connectivity->limitations())
+    {
+        result.push_back(
+                static_cast<NetworkingStatus::Limitations>(limitation));
+    }
+    return result;
+}
+
+NetworkingStatus::Status
+NetworkingStatus::status() const
+{
+    return static_cast<NetworkingStatus::Status>(d->m_connectivity->status());
+}
+
+}
+}
+
+#include "networking-status.moc"

=== added file 'src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h'
--- src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h	2015-05-13 10:12:45 +0000
@@ -0,0 +1,109 @@
+/*
+ * 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]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QVector>
+
+namespace ubuntu {
+namespace connectivity {
+
+/**
+ * @brief Overall system networking status.
+ *
+ * This is the top-level class for accessing networking information.
+ *
+ * * For system networking status, see NetworkingStatus::status.
+ * * For connection limitations, see NetworkingStatus::limitations.
+ *
+ * Examples:
+ * - @ref networking-status "Getting the networking status."
+ */
+class Q_DECL_EXPORT NetworkingStatus : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(NetworkingStatus)