Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/split-scope-template into lp:qtcreator-plugin-ubuntu

[Marcus Tomlinson]

Split scope template into "14.10" and "Current" variations

Split scope template into "14.10" and "Current" variations

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/548/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/548/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/qtcreator-plugin-ubuntu/split-scope-template]

396. By Marcus Tomlinson on 2015-06-11

Added scope-14.10 project wizard to qtcreator-plugin-ubuntu-common.install

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/549/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/549/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/qtcreator-plugin-ubuntu-common.install'
--- debian/qtcreator-plugin-ubuntu-common.install	2015-01-16 22:15:55 +0000
+++ debian/qtcreator-plugin-ubuntu-common.install	2015-06-11 10:48:39 +0000
@@ -5,6 +5,7 @@
 usr/share/qtcreator/templates/wizards/ubuntu/html5-simple
 usr/share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake
 usr/share/qtcreator/templates/wizards/ubuntu/scope
+usr/share/qtcreator/templates/wizards/ubuntu/scope-14.10
 usr/share/qtcreator/templates/wizards/ubuntu/share
 usr/share/qtcreator/templates/wizards/ubuntu/simple-app-qmake
 usr/share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,116 @@
+project(%ProjectName:l% CXX)
+cmake_minimum_required(VERSION 2.8.10)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+# We require g++ 4.9, to avoid ABI breakage with earlier version.
+set(cxx_version_required 4.9)
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if (NOT CMAKE_CXX_COMPILER_VERSION MATCHES "^${cxx_version_required}")
+        message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
+    endif()
+endif()
+
+# Set strict and naggy C++ compiler flags, and enable C++11
+add_definitions(
+  -fno-permissive
+  -std=c++11
+  -pedantic
+  -Wall
+  -Wextra
+  -fPIC
+  -DQT_NO_KEYWORDS
+)
+
+include(GNUInstallDirs)
+find_package(PkgConfig)
+find_package(Intltool)
+
+# We depend on Boost for string trimming
+find_package(
+  Boost
+  REQUIRED
+)
+
+# Search for our dependencies
+pkg_check_modules(
+  SCOPE
+  libunity-scopes>=0.6.0
+@if "%ContentType%" == "network-netcpp-json"
+  jsoncpp
+@endif
+@if "%ContentType%".substring(0, "network-netcpp".length) === "network-netcpp"
+  net-cpp>=1.1.0
+@endif
+  REQUIRED
+)
+
+@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
+find_package(Qt5Core REQUIRED)
+include_directories(${Qt5Core_INCLUDE_DIRS})
+@endif
+
+# Add our dependencies to the include paths
+include_directories(
+  "${CMAKE_SOURCE_DIR}/include"
+  ${Boost_INCLUDE_DIRS}
+  ${SCOPE_INCLUDE_DIRS}
+)
+
+# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
+set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
+
+# Important project paths
+set(CMAKE_INSTALL_PREFIX /)
+set(SCOPE_INSTALL_DIR "/%ClickHookName:l%")
+set(GETTEXT_PACKAGE "%ProjectName:l%")
+set(PACKAGE_NAME "%ProjectName:l%.%ClickDomain:l%")
+set(SCOPE_NAME "${PACKAGE_NAME}_%ClickHookName:l%")
+
+# If we need to refer to the scope's name or package in code, these definitions will help
+
+add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")
+add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
+add_definitions(-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
+
+#This command figures out the target architecture and puts it into the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE CLICK_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+
+# Install the click manifest
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
+install(FILES "%ClickHookName:l%.apparmor" DESTINATION "/")
+
+# Make these files show up in QtCreator
+file(GLOB_RECURSE
+  _PO_FILES
+  "po/*.po" 
+)
+add_custom_target(hidden_files
+  ALL
+  SOURCES
+    manifest.json.in
+    %ClickHookName:l%.apparmor
+    data/${SCOPE_NAME}.ini.in
+    po/POTFILES.in
+    po/${GETTEXT_PACKAGE}.pot
+    ${_PO_FILES}
+)
+
+# Add our main directories
+add_subdirectory(src)
+add_subdirectory(data)
+add_subdirectory(po)
+
+# Set up the tests
+enable_testing()
+add_subdirectory(tests)
+add_custom_target(
+  check
+  ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
+)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindGMock.cmake'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindGMock.cmake	2015-06-11 10:48:39 +0000
@@ -0,0 +1,12 @@
+# 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)
+
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindIntltool.cmake'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindIntltool.cmake	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindIntltool.cmake	2015-06-11 10:48:39 +0000
@@ -0,0 +1,265 @@
+# 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/>.
+
+# This package provides macros that wrap the intltool programs.
+# 
+# An example of common usage is:
+#
+# For an ini file:
+#
+# intltool_merge_translations(
+#   "foo.ini.in"
+#   "${CMAKE_CURRENT_BINARY_DIR}/foo.ini"
+#   ALL
+#   UTF8
+# )
+#
+# Inside po/CMakeLists.txt:
+#
+# intltool_update_potfile(
+#     ALL
+#     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+# )
+#
+# intltool_install_translations(
+#     ALL
+#     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+# )
+
+find_package(Gettext REQUIRED)
+
+find_program(INTLTOOL_UPDATE_EXECUTABLE intltool-update)
+
+if(INTLTOOL_UPDATE_EXECUTABLE)
+    execute_process(
+        COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} --version
+        OUTPUT_VARIABLE intltool_update_version
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (intltool_update_version MATCHES "^intltool-update \\(.*\\) [0-9]")
+        string(
+            REGEX REPLACE "^intltool-update \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1"
+            INTLTOOL_UPDATE_VERSION_STRING "${intltool_update_version}"
+        )
+    endif()
+    unset(intltool_update_version)
+endif()
+
+find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+
+if(INTLTOOL_MERGE_EXECUTABLE)
+    execute_process(
+        COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --version
+        OUTPUT_VARIABLE intltool_merge_version
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (intltool_update_version MATCHES "^intltool-merge \\(.*\\) [0-9]")
+        string(
+            REGEX REPLACE "^intltool-merge \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1"
+            INTLTOOL_MERGE_VERSION_STRING "${intltool_merge_version}"
+        )
+    endif()
+    unset(intltool_merge_version)
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(
+    Intltool
+    REQUIRED_VARS
+      INTLTOOL_UPDATE_EXECUTABLE
+      INTLTOOL_MERGE_EXECUTABLE
+    VERSION_VAR
+      INTLTOOL_UPDATE_VERSION_STRING
+    HANDLE_COMPONENTS
+)
+
+function(APPEND_EACH LISTNAME GLUE OUTPUT)
+    set(_tmp_list "")
+    foreach(VAL ${${LISTNAME}})
+        list(APPEND _tmp_list "${GLUE}${VAL}")
+    endforeach(VAL ${${LISTNAME}})
+    set(${OUTPUT} "${_tmp_list}" PARENT_SCOPE)
+endfunction()
+
+function(INTLTOOL_UPDATE_POTFILE)
+    set(_options ALL)
+    set(_oneValueArgs GETTEXT_PACKAGE OUTPUT_FILE PO_DIRECTORY)
+
+    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
+    
+    set(_POT_FILE "${PROJECT}.pot")
+
+    set(_GETTEXT_PACKAGE "")
+    if(_ARG_GETTEXT_PACKAGE)
+        set(_POT_FILE "${_ARG_GETTEXT_PACKAGE}.pot")
+        set(_GETTEXT_PACKAGE --gettext-package="${_ARG_GETTEXT_PACKAGE}")
+    endif()
+
+    set(_OUTPUT_FILE "")
+    if(_ARG_OUTPUT_FILE)
+        set(_POT_FILE "${_ARG_OUTPUT_FILE}")
+        set(_OUTPUT_FILE --output-file="${_ARG_OUTPUT_FILE}")
+    endif()
+
+    set(_PO_DIRECTORY "${CMAKE_SOURCE_DIR}/po")
+    if(_ARG_PO_DIRECTORY)
+        set(_PO_DIRECTORY "${_ARG_PO_DIRECTORY}")
+    endif()
+    
+    file(
+        GLOB_RECURSE _CODE_SOURCES
+        ${CMAKE_SOURCE_DIR}/*.cpp
+        ${CMAKE_SOURCE_DIR}/*.cc
+        ${CMAKE_SOURCE_DIR}/*.cxx
+        ${CMAKE_SOURCE_DIR}/*.vala
+        ${CMAKE_SOURCE_DIR}/*.c
+        ${CMAKE_SOURCE_DIR}/*.h
+        ${CMAKE_SOURCE_DIR}/*.ini.in
+    )
+
+    add_custom_command(
+        OUTPUT
+          "${_PO_DIRECTORY}/${_POT_FILE}"
+        COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} --pot ${_OUTPUT_FILE} ${_GETTEXT_PACKAGE}
+        DEPENDS
+          "${_PO_DIRECTORY}/POTFILES.in"
+          ${_CODE_SOURCES}
+        WORKING_DIRECTORY ${_PO_DIRECTORY}
+    )
+    
+    _GETTEXT_GET_UNIQUE_TARGET_NAME(${_POT_FILE} _UNIQUE_TARGET_NAME)
+
+    if(_ARG_ALL)
+        add_custom_target(
+          ${_UNIQUE_TARGET_NAME}
+          ALL
+          DEPENDS
+            "${_PO_DIRECTORY}/${_POT_FILE}"
+        )
+    else()
+        add_custom_target(
+          ${_UNIQUE_TARGET_NAME}
+          DEPENDS
+            "${_PO_DIRECTORY}/${_POT_FILE}"
+        )
+    endif()
+endfunction()
+
+function(INTLTOOL_INSTALL_TRANSLATIONS)
+    set(_options ALL)
+    set(_oneValueArgs GETTEXT_PACKAGE POT_FILE)
+
+    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
+
+    set(_POT_FILE "${PROJECT}.pot")
+
+    if(_ARG_GETTEXT_PACKAGE)
+        set(_POT_FILE "${_ARG_GETTEXT_PACKAGE}.pot")
+    endif()
+
+    if(_ARG_OUTPUT_FILE)
+        set(_POT_FILE "${_ARG_OUTPUT_FILE}")
+    endif()
+
+    file(
+        GLOB _PO_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/*.po
+    )
+
+    get_filename_component(_ABS_POT_FILE ${_POT_FILE} ABSOLUTE)
+
+    foreach(_PO_FILE ${_PO_FILES})
+        add_custom_command(
+           OUTPUT
+             ${_PO_FILE}
+           COMMAND
+             ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_PO_FILE} ${_ABS_POT_FILE}
+           DEPENDS
+             ${_ABS_POT_FILE}
+        )
+    endforeach()
+
+    if(_ARG_ALL)
+        gettext_create_translations(
+          ${_POT_FILE}
+          ALL
+          ${_PO_FILES}
+        )
+    else()
+        gettext_create_translations(
+          ${_POT_FILE}
+          ${_PO_FILES}
+        )
+    endif()
+endfunction()
+
+function(INTLTOOL_MERGE_TRANSLATIONS FILENAME OUTPUT_FILE)
+    set(_options ALL UTF8 PASS_THROUGH)
+    set(_oneValueArgs PO_DIRECTORY)
+
+    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
+
+    get_filename_component(_ABS_FILENAME ${FILENAME} ABSOLUTE)
+
+    set(_PO_DIRECTORY "${CMAKE_SOURCE_DIR}/po")
+    if(_ARG_PO_DIRECTORY)
+        set(_PO_DIRECTORY "${_ARG_PO_DIRECTORY}")
+    endif()
+
+    set(_UTF8 "")
+    if(_ARG_UTF8)
+        set(_UTF8 "--utf8")
+    endif()
+
+    set(_PASS_THROUGH "")
+    if(_ARG_PASS_THROUGH)
+        set(_PASS_THROUGH "--pass-through")
+    endif()
+    
+    file(
+        GLOB_RECURSE _PO_FILES
+        ${_PO_DIRECTORY}/*.po
+    )
+
+    add_custom_command(
+        OUTPUT
+          ${OUTPUT_FILE}
+        COMMAND
+          ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style --quiet ${_UTF8} ${_PASS_THROUGH} ${_PO_DIRECTORY} ${FILENAME} ${OUTPUT_FILE}
+        DEPENDS
+          ${_ABS_FILENAME}
+          ${_PO_FILES}
+        WORKING_DIRECTORY
+          ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    
+    get_filename_component(_OUTPUT_NAME ${OUTPUT_FILE} NAME)
+    _GETTEXT_GET_UNIQUE_TARGET_NAME(${_OUTPUT_NAME} _UNIQUE_TARGET_NAME)
+
+    if(_ARG_ALL)
+        add_custom_target(
+          ${_UNIQUE_TARGET_NAME}
+          ALL
+          DEPENDS
+            ${OUTPUT_FILE}
+        )
+    else()
+        add_custom_target(
+          ${_UNIQUE_TARGET_NAME}
+          DEPENDS
+            ${OUTPUT_FILE}
+        )
+    endif()
+endfunction()

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,10 @@
+
+# Install the scope images
+install(
+  FILES
+    "icon.png"
+    "logo.png"
+    "screenshot.png"
+  DESTINATION
+    "${SCOPE_INSTALL_DIR}"
+)

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/displayName.ini.in'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/displayName.ini.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/displayName.ini.in	2015-06-11 10:48:39 +0000
@@ -0,0 +1,9 @@
+[ScopeConfig]
+_DisplayName=%ProjectName:c% Scope
+_Description=This is a %ProjectName:c% scope
+Art=screenshot.png
+Author=Firstname Lastname
+Icon=icon.png
+
+[Appearance]
+PageHeader.Logo=logo.png

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/icon.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/icon.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/icon.png	2015-06-11 10:48:39 +0000 differ
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/logo.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/logo.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/logo.png	2015-06-11 10:48:39 +0000 differ
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/screenshot.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/screenshot.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/screenshot.png	2015-06-11 10:48:39 +0000 differ
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/displayName.apparmor'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/displayName.apparmor	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/displayName.apparmor	2015-06-11 10:48:39 +0000
@@ -0,0 +1,6 @@
+{
+    "template": "%ConfinementType%",
+    "policy_groups": [],
+    "policy_version": %ClickAAPolicyVersion%
+}
+

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/client.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/client.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/client.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,168 @@
+#ifndef API_CLIENT_H_
+#define API_CLIENT_H_
+
+#include <api/config.h>
+
+#include <atomic>
+#include <deque>
+#include <map>
+#include <string>
+@if "%ContentType%".substring(0, "network".length) === "network"
+#include <core/net/http/request.h>
+#include <core/net/uri.h>
+
+@if "%ContentType%" == "network-netcpp-json"
+namespace Json {
+class Value;
+}
+@elsif "%ContentType%" == "network-netcpp-qjson"
+#include <QJsonDocument>
+@elsif "%ContentType%" == "network-netcpp-qxml"
+#include <QXmlStreamReader>
+@endif
+@endif
+
+namespace api {
+
+/**
+ * Provide a nice way to access the HTTP API.
+ *
+ * We don't want our scope's code to be mixed together with HTTP and JSON handling.
+ */
+class Client {
+public:
+
+@if "%ContentType%" == "empty"
+    /**
+     * Result struct
+     */
+    struct Result {
+        std::string uri;
+        std::string title;
+        std::string art;
+        std::string subtitle;
+        std::string description;
+    };
+
+    /**
+     * A list of weather information
+     */
+    typedef std::deque<Result> ResultList;
+@endif
+@if "%ContentType%".substring(0, "network".length) === "network"
+    /**
+     * Information about a City
+     */
+    struct City {
+        unsigned int id;
+        std::string name;
+        std::string country;
+    };
+
+    /**
+     * Temperature information for a day.
+     */
+    struct Temp {
+        double max;
+        double min;
+        double cur;
+    };
+
+    /**
+     * Weather information for a day.
+     */
+    struct Weather {
+        unsigned int id;
+        std::string main;
+        std::string description;
+        std::string icon;
+        Temp temp;
+    };
+
+    /**
+     * A list of weather information
+     */
+    typedef std::deque<Weather> WeatherList;
+
+    /**
+     * Weather information about the current day
+     */
+    struct Current {
+        City city;
+        Weather weather;
+    };
+
+    /**
+     * Forecast information about a city
+     */
+    struct Forecast {
+        City city;
+        WeatherList weather;
+    };
+@endif
+
+    Client(Config::Ptr config);
+
+    virtual ~Client() = default;
+
+@if "%ContentType%" == "empty"
+    /**
+     * Search for results
+     */
+    virtual ResultList search(const std::string &query);
+@endif
+@if "%ContentType%".substring(0, "network".length) === "network"
+    /**
+     * Get the current weather for the specified location
+     */
+    virtual Current weather(const std::string &query);
+
+    /**
+     * Get the weather forecast for the specified location and duration
+     */
+    virtual Forecast forecast_daily(const std::string &query, unsigned int days = 7);
+@endif
+
+    /**
+     * Cancel any pending queries (this method can be called from a different thread)
+     */
+    virtual void cancel();
+
+    virtual Config::Ptr config();
+
+protected:
+@if "%ContentType%" == "network-netcpp-json"
+    void get(const core::net::Uri::Path &path,
+            const core::net::Uri::QueryParameters &parameters,
+            Json::Value &root);
+@elsif "%ContentType%" == "network-netcpp-qjson"
+    void get(const core::net::Uri::Path &path,
+                const core::net::Uri::QueryParameters &parameters,
+                QJsonDocument &root);
+@elsif "%ContentType%" == "network-netcpp-qxml"
+    void get(const core::net::Uri::Path &path,
+                const core::net::Uri::QueryParameters &parameters,
+                QXmlStreamReader &reader);
+@endif
+@if "%ContentType%".substring(0, "network".length) === "network"
+    /**
+     * Progress callback that allows the query to cancel pending HTTP requests.
+     */
+    core::net::http::Request::Progress::Next progress_report(
+            const core::net::http::Request::Progress& progress);
+@endif
+
+    /**
+     * Hang onto the configuration information
+     */
+    Config::Ptr config_;
+
+    /**
+     * Thread-safe cancelled flag
+     */
+    std::atomic<bool> cancelled_;
+};
+
+}
+
+#endif // API_CLIENT_H_

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/config.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/config.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/config.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,27 @@
+#ifndef API_CONFIG_H_
+#define API_CONFIG_H_
+
+#include <memory>
+#include <string>
+
+namespace api {
+
+struct Config {
+    typedef std::shared_ptr<Config> Ptr;
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+    /*
+     * The root of all API request URLs
+     */
+    std::string apiroot { "http://api.openweathermap.org" };
+
+    /*
+     * The custom HTTP user agent string for this library
+     */
+    std::string user_agent { "example-network-scope 0.1; (foo)" };
+@endif
+};
+
+}
+
+#endif /* API_CONFIG_H_ */

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/localization.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/localization.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/localization.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,22 @@
+#ifndef SCOPE_LOCALIZATION_H_
+#define SCOPE_LOCALIZATION_H_
+
+#include <libintl.h>
+#include <string>
+
+inline char * _(const char *__msgid) {
+    return dgettext(GETTEXT_PACKAGE, __msgid);
+}
+
+inline std::string _(const char *__msgid1, const char *__msgid2,
+                     unsigned long int __n) {
+    char buffer [256];
+    if (snprintf ( buffer, 256, dngettext(GETTEXT_PACKAGE, __msgid1, __msgid2, __n), __n ) >= 0) {
+        return buffer;
+    } else {
+        return std::string();
+    }
+}
+
+#endif // SCOPE_LOCALIZATION_H_
+

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/preview.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/preview.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/preview.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,37 @@
+#ifndef SCOPE_PREVIEW_H_
+#define SCOPE_PREVIEW_H_
+
+#include <unity/scopes/PreviewQueryBase.h>
+
+namespace unity {
+namespace scopes {
+class Result;
+}
+}
+
+namespace scope {
+
+/**
+ * Represents an individual preview request.
+ *
+ * Each time a result is previewed in the UI a new Preview
+ * object is created.
+ */
+class Preview: public unity::scopes::PreviewQueryBase {
+public:
+    Preview(const unity::scopes::Result &result,
+            const unity::scopes::ActionMetadata &metadata);
+
+    ~Preview() = default;
+
+    void cancelled() override;
+
+    /**
+     * Populates the reply object with preview information.
+     */
+    void run(unity::scopes::PreviewReplyProxy const& reply) override;
+};
+
+}
+
+#endif // SCOPE_PREVIEW_H_

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/query.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/query.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/query.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,36 @@
+#ifndef SCOPE_QUERY_H_
+#define SCOPE_QUERY_H_
+
+#include <api/client.h>
+
+#include <unity/scopes/SearchQueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
+
+namespace scope {
+
+/**
+ * Represents an individual query.
+ *
+ * A new Query object will be constructed for each query. It is
+ * given query information, metadata about the search, and
+ * some scope-specific configuration.
+ */
+class Query: public unity::scopes::SearchQueryBase {
+public:
+    Query(const unity::scopes::CannedQuery &query,
+            const unity::scopes::SearchMetadata &metadata, api::Config::Ptr config);
+
+    ~Query() = default;
+
+    void cancelled() override;
+
+    void run(const unity::scopes::SearchReplyProxy &reply) override;
+
+private:
+    api::Client client_;
+};
+
+}
+
+#endif // SCOPE_QUERY_H_
+

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/scope.h'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/scope.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/scope.h	2015-06-11 10:48:39 +0000
@@ -0,0 +1,53 @@
+#ifndef SCOPE_SCOPE_H_
+#define SCOPE_SCOPE_H_
+
+#include <api/config.h>
+
+#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/PreviewQueryBase.h>
+
+namespace scope {
+
+/**
+ * Defines the lifecycle of scope plugin, and acts as a factory
+ * for Query and Preview objects.
+ *
+ * Note that the #preview and #search methods are each called on
+ * different threads, so some form of interlocking is required
+ * if shared data structures are used.
+ */
+class Scope: public unity::scopes::ScopeBase {
+public:
+    /**
+     * Called once at startup
+     */
+    void start(std::string const&) override;
+
+    /**
+     * Called at shutdown
+     */
+    void stop() override;
+
+    /**
+     * Called each time a new preview is requested
+     */
+    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
+            const unity::scopes::ActionMetadata&) override;
+
+    /**
+     * Called each time a new query is requested
+     */
+    unity::scopes::SearchQueryBase::UPtr search(
+            unity::scopes::CannedQuery const& q,
+            unity::scopes::SearchMetadata const&) override;
+
+protected:
+    api::Config::Ptr config_;
+};
+
+}
+
+#endif // SCOPE_SCOPE_H_

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/manifest.json.in'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/manifest.json.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/manifest.json.in	2015-06-11 10:48:39 +0000
@@ -0,0 +1,19 @@
+{
+@if "%ContentType%".substring(0, "network".length) === "network"
+  "description": "A simple Unity scope that accesses the network",
+@else
+  "description": "A simple Unity scope that accesses local content",
+@endif
+  "maintainer": "%ClickMaintainer%",
+  "architecture": "@CLICK_ARCH@",
+  "name": "%ProjectName:l%.%ClickDomain:l%",
+  "title": "%ProjectName:l%",
+  "framework" : "%ClickFrameworkVersion%",
+  "hooks": {
+    "%ClickHookName:l%": {
+      "scope": "%ClickHookName:l%",
+      "apparmor": "%ClickHookName:l%.apparmor"
+    }
+  }
+}
+

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/po'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,9 @@
+intltool_update_potfile(
+  ALL
+  GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)
+
+intltool_install_translations(
+  ALL
+  GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/Makefile.in.in'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/Makefile.in.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/Makefile.in.in	2015-06-11 10:48:39 +0000
@@ -0,0 +1,1 @@
+XGETTEXT_KEYWORDS=--c++ --keyword=_ --keyword=N_ --keyword=_:1,2
\ No newline at end of file

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/POTFILES.in'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/POTFILES.in	2015-06-11 10:48:39 +0000
@@ -0,0 +1,11 @@
+[type: gettext/ini] data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in
+include/api/config.h
+include/api/client.h
+include/scope/preview.h
+include/scope/localization.h
+include/scope/query.h
+include/scope/scope.h
+src/api/client.cpp
+src/scope/query.cpp
+src/scope/scope.cpp
+src/scope/preview.cpp

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/displayName.pot'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/readme.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/readme.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/readme.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,26 @@
+Unity scope template
+
+Building
+--------
+
+To build this scope outside of QtCreator, please install phablet-tools and run click-buddy.
+
+Localization
+------------
+
+intltool is used to perform localization of the scope. Ensure whenever you add / rename files
+that contain localizable strings you update "po/POTFILES.in".
+
+When you want to add a new language to the translation catalogue:
+
+ * Copy the .pot file from the "po" directory and rename it to e.g. "zh_CN.po", 
+   where "zh_CN" is the language code for China.
+ * Enter the language code in "Language:".
+ * Enter the "UTF-8" as the "Content-Type:".
+ * Enter the translations in the msgstr tags.
+
+For the new translation to show up, cmake needs to be re-run to enable the recusive search
+macro to delect the new translation. In QtCreator this can be done with the "Build->Run Cmake"
+menu entry.
+
+Remember! When you copy the .pot file, make sure you change the file extension to ".po".

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,84 @@
+
+# Put the ini file in the build directory next to the scope
+# .so file so test tools can find both easily.
+intltool_merge_translations(
+  "${CMAKE_SOURCE_DIR}/data/${SCOPE_NAME}.ini.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
+  ALL
+  UTF8
+)
+
+# Install the scope ini file
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
+  DESTINATION ${SCOPE_INSTALL_DIR}
+)
+
+configure_file(
+  "${CMAKE_SOURCE_DIR}/data/logo.png"
+  "${CMAKE_CURRENT_BINARY_DIR}/logo.png"
+  @ONLY
+  COPYONLY
+)
+
+# The sources to build the scope
+set(SCOPE_SOURCES
+  api/client.cpp
+  scope/preview.cpp
+  scope/query.cpp
+  scope/scope.cpp
+)
+
+# Find all the headers
+file(GLOB_RECURSE
+  SCOPE_HEADERS
+  "${CMAKE_SOURCE_DIR}/include/*.h" 
+)
+
+# Build an object library for the scope code
+add_library(
+  scope-static OBJECT
+  ${SCOPE_SOURCES}
+  ${SCOPE_HEADERS}
+)
+
+# Ensure we export all the symbols
+set_target_properties(
+  scope-static
+  PROPERTIES
+    LINK_FLAGS "-Wl,--export-all-symbols"
+)
+
+# Build a shared library containing our scope code.
+# This will be the actual plugin that is loaded.
+add_library(
+  scope SHARED
+  $<TARGET_OBJECTS:scope-static>
+)
+
+# Link against the object library and our external library dependencies
+target_link_libraries(
+  scope
+  ${SCOPE_LDFLAGS}
+  ${Boost_LIBRARIES}
+)
+
+@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
+qt5_use_modules(
+  scope
+  Core
+)
+@endif
+
+# Set the correct library output name to conform to the securiry policy 
+set_target_properties(
+  scope
+  PROPERTIES
+    OUTPUT_NAME "${SCOPE_NAME}"
+)
+
+# Install the scope shared library
+install(
+  TARGETS scope
+  LIBRARY DESTINATION ${SCOPE_INSTALL_DIR}
+)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp	2015-06-11 10:48:39 +0000
@@ -0,0 +1,500 @@
+#include <api/client.h>
+
+@if "%ContentType%".substring(0, "network-netcpp".length) === "network-netcpp"
+#include <core/net/error.h>
+#include <core/net/http/client.h>
+#include <core/net/http/content_type.h>
+#include <core/net/http/response.h>
+@if "%ContentType%" == "network-netcpp-json"
+#include <json/json.h>
+@elsif "%ContentType%" == "network-netcpp-qjson"
+#include <QVariantMap>
+@endif
+
+namespace http = core::net::http;
+namespace net = core::net;
+@if "%ContentType%" == "network-netcpp-json"
+namespace json = Json;
+@endif
+@endif
+
+using namespace api;
+using namespace std;
+
+Client::Client(Config::Ptr config) :
+        config_(config), cancelled_(false) {
+}
+
+@if "%ContentType%" == "network-netcpp-qxml"
+namespace {
+static QString readText(QXmlStreamReader& xml)
+{
+    xml.readNext();
+
+    if (xml.tokenType() != QXmlStreamReader::Characters) {
+        return QString();
+    }
+
+    return xml.text().toString();
+}
+
+static void parseCity(Client::City& city, QXmlStreamReader& xml)
+{
+    QXmlStreamAttributes attributes = xml.attributes();
+    if (attributes.hasAttribute("id")) {
+        city.id = attributes.value("id").toUInt();
+    }
+    if (attributes.hasAttribute("name")) {
+        city.name = attributes.value("name").toString().toStdString();
+    }
+
+    xml.readNext();
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "city")) {
+        if (xml.isStartElement()) {
+            if (xml.name() == "country") {
+                city.country = readText(xml).toStdString();
+            }
+        }
+        xml.readNext();
+    }
+}
+
+static void parseWeather(Client::Weather& weather, QXmlStreamReader& xml)
+{
+    QXmlStreamAttributes attributes = xml.attributes();
+    if (attributes.hasAttribute("id")) {
+        weather.id = attributes.value("id").toUInt();
+    }
+    if (attributes.hasAttribute("value")) {
+        weather.description = attributes.value("value").toString().toStdString();
+    }
+    if (attributes.hasAttribute("icon")) {
+        weather.icon = "http://openweathermap.org/img/w/"
+                    + attributes.value("icon").toString().toStdString() + ".png";
+    }
+
+    xml.readNext();
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "weather")) {
+        xml.readNext();
+    }
+}
+
+static void parseTemperature(Client::Temp& temp, QXmlStreamReader& xml)
+{
+    QXmlStreamAttributes attributes = xml.attributes();
+    if (attributes.hasAttribute("value")) {
+        temp.cur = attributes.value("value").toDouble();
+    }
+    if (attributes.hasAttribute("max")) {
+        temp.max = attributes.value("max").toDouble();
+    }
+    if (attributes.hasAttribute("min")) {
+        temp.min = attributes.value("min").toDouble();
+    }
+
+    xml.readNext();
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "temperature")) {
+        xml.readNext();
+    }
+}
+
+static void parseLocation(Client::City& city, QXmlStreamReader& xml)
+{
+    xml.readNext();
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "location")) {
+        if (xml.name() == "name") {
+            city.name = readText(xml).toStdString();
+        } else if (xml.name() == "country") {
+            city.country = readText(xml).toStdString();
+        }
+
+        xml.readNext();
+    }
+}
+
+static void parseTime(Client::Weather& weather, QXmlStreamReader& xml)
+{
+    xml.readNext();
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "time"))
+    {
+        if (xml.name() == "symbol") {
+            QXmlStreamAttributes attributes = xml.attributes();
+            if (attributes.hasAttribute("name")) {
+                weather.description = attributes.value("name").toString().toStdString();
+            }
+            if (attributes.hasAttribute("var")) {
+                weather.icon = "http://openweathermap.org/img/w/"
+                        + attributes.value("var").toString().toStdString() + ".png";
+            }
+        } else if (xml.name() == "temperature") {
+            QXmlStreamAttributes attributes = xml.attributes();
+            if (attributes.hasAttribute("max")) {
+                weather.temp.max = attributes.value("max").toDouble();
+            }
+            if (attributes.hasAttribute("min")) {
+                weather.temp.min = attributes.value("min").toDouble();
+            }
+            if (attributes.hasAttribute("day")) {
+                weather.temp.cur = attributes.value("day").toDouble();
+            }
+        }
+
+        xml.readNext();
+    }
+}
+
+static void parseForecast(Client::WeatherList& weather_list, QXmlStreamReader& xml)
+{
+    xml.readNext();
+
+    unsigned int weather_id = 1000000;
+
+    while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == "forecast"))
+    {
+        if (xml.name() == "time") {
+            Client::Weather weather;
+            weather.id = weather_id++;
+            parseTime(weather, xml);
+            weather_list.emplace_back(weather);
+        }
+        xml.readNext();
+    }
+}
+
+}
+@endif
+
+@if "%ContentType%" == "empty"
+Client::ResultList Client::search(const string &query) {
+    ResultList results;
+
+    // This is the method that we will call from the Query class.
+    // It just returns some results.
+    // You can add here your code to get results from an http API, from your local disk
+    // or anywhere.
+
+    // In this case we just create some results withouth accessing any other source of
+    // data
+    {
+        Result result;
+        result.uri = "uri";
+        result.title = query;
+        result.art = "art.png";
+        result.subtitle = "subtitle";
+        result.description = "description";
+        results.emplace_back(result);
+    }
+    {
+        Result result;
+        result.uri = "uri2";
+        result.title = query;
+        result.art = "art2.png";
+        result.subtitle = "subtitle2";
+        result.description = "description2";
+        results.emplace_back(result);
+    }
+
+    return results;
+}
+@endif
+@if "%ContentType%".substring(0, "network-netcpp".length) === "network-netcpp"
+@if "%ContentType%" == "network-netcpp-json"
+void Client::get(const net::Uri::Path &path,
+        const net::Uri::QueryParameters &parameters, json::Value &root) {
+@elsif "%ContentType%" == "network-netcpp-qjson"
+void Client::get(const net::Uri::Path &path,
+        const net::Uri::QueryParameters &parameters, QJsonDocument &root) {
+@elsif "%ContentType%" == "network-netcpp-qxml"
+void Client::get(const net::Uri::Path &path,
+        const net::Uri::QueryParameters &parameters, QXmlStreamReader &reader) {
+@endif
+    // Create a new HTTP client
+    auto client = http::make_client();
+
+    // Start building the request configuration
+    http::Request::Configuration configuration;
+
+    // Build the URI from its components
+    net::Uri uri = net::make_uri(config_->apiroot, path, parameters);
+    configuration.uri = client->uri_to_string(uri);
+
+    // Give out a user agent string
+    configuration.header.add("User-Agent", config_->user_agent);
+
+    // Build a HTTP request object from our configuration
+    auto request = client->head(configuration);
+
+    try {
+        // Synchronously make the HTTP request
+        // We bind the cancellable callback to #progress_report
+        auto response = request->execute(
+                bind(&Client::progress_report, this, placeholders::_1));
+
+        // Check that we got a sensible HTTP status code
+        if (response.status != http::Status::ok) {
+            throw domain_error(response.body);
+        }
+@if "%ContentType%" == "network-netcpp-json"
+        // Parse the JSON from the response
+        json::Reader reader;
+        reader.parse(response.body, root);
+
+        // Open weather map API error code can either be a string or int
+        json::Value cod = root["cod"];
+        if ((cod.isString() && cod.asString() != "200")
+                || (cod.isUInt() && cod.asUInt() != 200)) {
+            throw domain_error(root["message"].asString());
+        }
+@elsif "%ContentType%" == "network-netcpp-qjson"
+        // Parse the JSON from the response
+        root = QJsonDocument::fromJson(response.body.c_str());
+
+        // Open weather map API error code can either be a string or int
+        QVariant cod = root.toVariant().toMap()["cod"];
+        if ((cod.canConvert<QString>() && cod.toString() != "200")
+                || (cod.canConvert<unsigned int>() && cod.toUInt() != 200)) {
+            throw domain_error(root.toVariant().toMap()["message"].toString().toStdString());
+        }
+@elsif "%ContentType%" == "network-netcpp-qxml"
+        // Parse the Xml from the response
+        reader.addData(response.body.c_str());
+@endif
+    } catch (net::Error &) {
+    }
+}
+
+Client::Current Client::weather(const string& query) {
+    // This is the method that we will call from the Query class.
+    // It connects to an HTTP source and returns the results.
+
+@if "%ContentType%" == "network-netcpp-json"
+
+    // In this case we are going to retrieve JSON data.
+    json::Value root;
+@elsif "%ContentType%" == "network-netcpp-qjson"
+
+    // In this case we are going to retrieve JSON data.
+    QJsonDocument root;
+@elsif "%ContentType%" == "network-netcpp-qxml"
+
+    // In this case we are going to retrieve XML data.
+    QXmlStreamReader root;
+@endif
+
+    // Build a URI and get the contents.
+    // The fist parameter forms the path part of the URI.
+    // The second parameter forms the CGI parameters.
+    get(
+        { "data", "2.5", "weather" },
+        { { "q", query }, { "units", "metric" }
+@if "%ContentType%" == "network-netcpp-qxml"
+        , { "mode", "xml" }
+@endif
+        },
+        root);
+    // e.g. http://api.openweathermap.org/data/2.5/weather?q=QUERY&units=metric
+
+    Current result;
+
+@if "%ContentType%" == "network-netcpp-json"
+    // Read out the city we found
+    json::Value sys = root["sys"];
+    result.city.id = sys["id"].asUInt();
+    result.city.name = root["name"].asString();
+    result.city.country = sys["country"].asString();
+
+    // Read the weather
+    json::Value weather = root["weather"].get(json::ArrayIndex(0),
+            json::Value());
+    result.weather.id = weather["id"].asUInt();
+    result.weather.main = weather["main"].asString();
+    result.weather.description = weather["description"].asString();
+    result.weather.icon = "http://openweathermap.org/img/w/"
+            + weather["icon"].asString() + ".png";
+
+    // Read the temps
+    json::Value main = root["main"];
+    result.weather.temp.cur = main["temp"].asDouble();
+    result.weather.temp.max = main["temp_max"].asDouble();
+    result.weather.temp.min = main["temp_min"].asDouble();
+@elsif "%ContentType%" == "network-netcpp-qjson"
+    // Read out the city we found
+    QVariantMap variant = root.toVariant().toMap();
+    QVariantMap sys = variant["sys"].toMap();
+    result.city.id = sys["id"].toUInt();
+    result.city.name = variant["name"].toString().toStdString();
+    result.city.country = sys["country"].toString().toStdString();
+
+    // Read the weather
+    QVariantMap weather = variant["weather"].toList().first().toMap();
+    result.weather.id = weather["id"].toUInt();
+    result.weather.main = weather["main"].toString().toStdString();
+    result.weather.description = weather["description"].toString().toStdString();
+    result.weather.icon = "http://openweathermap.org/img/w/"
+            + weather["icon"].toString().toStdString() + ".png";
+
+    // Read the temps
+    QVariantMap main = variant["main"].toMap();
+    result.weather.temp.cur = main["temp"].toDouble();
+    result.weather.temp.max = main["temp_max"].toDouble();
+    result.weather.temp.min = main["temp_min"].toDouble();
+@elsif "%ContentType%" == "network-netcpp-qxml"
+    while (!root.atEnd() && !root.hasError()) {
+        QXmlStreamReader::TokenType token = root.readNext();
+
+        /* If token is just StartDocument, we'll go to next.*/
+        if (token == QXmlStreamReader::StartDocument) {
+            continue;
+        }
+
+        /* If token is StartElement, we'll see if we can read it.*/
+        if (token == QXmlStreamReader::StartElement) {
+            if (root.name() == "current") {
+                root.readNext();
+            } else if (root.name() == "city") {
+                parseCity(result.city, root);
+            } else if (root.name() == "weather") {
+                parseWeather(result.weather, root);
+            } else if (root.name() == "temperature") {
+                parseTemperature(result.weather.temp, root);
+            }
+        }
+    }
+
+    if (root.hasError()) {
+        throw domain_error(root.errorString().toStdString());
+    }
+@endif
+    return result;
+}
+
+Client::Forecast Client::forecast_daily(const string& query, unsigned int cnt) {
+@if "%ContentType%" == "network-netcpp-json"
+    json::Value root;
+@elsif "%ContentType%" == "network-netcpp-qjson"
+    QJsonDocument root;
+@elsif "%ContentType%" == "network-netcpp-qxml"
+    QXmlStreamReader root;
+@endif
+
+    // Build a URI and get the contents
+    // The fist parameter forms the path part of the URI.
+    // The second parameter forms the CGI parameters.
+    get( { "data", "2.5", "forecast", "daily" }, { { "q", query }, { "units",
+            "metric" }, { "cnt", to_string(cnt) }
+@if "%ContentType%" == "network-netcpp-qxml"
+            , { "mode", "xml" }
+@endif
+        }, root);
+    // e.g. http://api.openweathermap.org/data/2.5/forecast/daily/?q=QUERY&units=metric&cnt=7
+
+    Forecast result;
+
+@if "%ContentType%" == "network-netcpp-json"
+    // Read out the city we found
+    json::Value city = root["city"];
+    result.city.id = city["id"].asUInt();
+    result.city.name = city["name"].asString();
+    result.city.country = city["country"].asString();
+
+    // Iterate through the weather data
+    json::Value list = root["list"];
+    for (json::ArrayIndex index = 0; index < list.size(); ++index) {
+        json::Value item = list.get(index, json::Value());
+
+        // Extract the first weather item
+        json::Value weather_list = item["weather"];
+        json::Value weather = weather_list.get(json::ArrayIndex(0),
+                json::Value());
+
+        // Extract the temperature data
+        json::Value temp = item["temp"];
+
+        // Add a result to the weather list
+        result.weather.emplace_back(
+                Weather { weather["id"].asUInt(), weather["main"].asString(),
+                        weather["description"].asString(),
+                        "http://openweathermap.org/img/w/"
+                                + weather["icon"].asString() + ".png", Temp {
+                                temp["max"].asDouble(), temp["min"].asDouble(),
+                                0.0 } });
+    }
+@elsif "%ContentType%" == "network-netcpp-qjson"
+    QVariantMap variant = root.toVariant().toMap();
+
+    // Read out the city we found
+    QVariantMap city = variant["city"].toMap();
+    result.city.id = city["id"].toUInt();
+    result.city.name = city["name"].toString().toStdString();
+    result.city.country = city["country"].toString().toStdString();
+
+    // Iterate through the weather data
+    for (const QVariant &i : variant["list"].toList()) {
+        QVariantMap item = i.toMap();
+
+        // Extract the first weather item
+        QVariantList weather_list = item["weather"].toList();
+        QVariantMap weather = weather_list.first().toMap();
+
+        // Extract the temperature data
+        QVariantMap temp = item["temp"].toMap();
+
+        // Add a result to the weather list
+        result.weather.emplace_back(
+                Weather { weather["id"].toUInt(), weather["main"].toString().toStdString(),
+                        weather["description"].toString().toStdString(),
+                        "http://openweathermap.org/img/w/"
+                                + weather["icon"].toString().toStdString() + ".png", Temp {
+                                temp["max"].toDouble(), temp["min"].toDouble(),
+                                0.0 } });
+    }
+@elsif "%ContentType%" == "network-netcpp-qxml"
+    while (!root.atEnd() && !root.hasError()) {
+        QXmlStreamReader::TokenType token = root.readNext();
+
+        /* If token is just StartDocument, we'll go to next.*/
+        if (token == QXmlStreamReader::StartDocument) {
+            continue;
+        }
+
+        /* If token is StartElement, we'll see if we can read it.*/
+        if (token == QXmlStreamReader::StartElement) {
+            if (root.name() == "weatherdata") {
+                root.readNext();
+            } else if (root.name() == "location") {
+                parseLocation(result.city, root);
+            } else if (root.name() == "forecast") {
+                parseForecast(result.weather, root);
+            }
+        }
+    }
+
+    if (root.hasError()) {
+        throw domain_error(root.errorString().toStdString());
+    }
+@endif
+
+    return result;
+}
+
+http::Request::Progress::Next Client::progress_report(
+        const http::Request::Progress&) {
+
+    return cancelled_ ?
+            http::Request::Progress::Next::abort_operation :
+            http::Request::Progress::Next::continue_operation;
+}
+@endif
+
+void Client::cancel() {
+    cancelled_ = true;
+}
+
+Config::Ptr Client::config() {
+    return config_;
+}

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/preview.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/preview.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/preview.cpp	2015-06-11 10:48:39 +0000
@@ -0,0 +1,67 @@
+#include <scope/preview.h>
+
+#include <unity/scopes/ColumnLayout.h>
+#include <unity/scopes/PreviewWidget.h>
+#include <unity/scopes/PreviewReply.h>
+#include <unity/scopes/Result.h>
+#include <unity/scopes/VariantBuilder.h>
+
+#include <iostream>
+
+namespace sc = unity::scopes;
+
+using namespace std;
+using namespace scope;
+
+Preview::Preview(const sc::Result &result, const sc::ActionMetadata &metadata) :
+        sc::PreviewQueryBase(result, metadata) {
+}
+
+void Preview::cancelled() {
+}
+
+void Preview::run(sc::PreviewReplyProxy const& reply) {
+    // Support three different column layouts
+    sc::ColumnLayout layout1col(1), layout2col(2), layout3col(3);
+
+    // We define 3 different layouts, that will be used depending on the
+    // device. The shell (view) will decide which layout fits best.
+    // If, for instance, we are executing in a tablet probably the view will use
+    // 2 or more columns.
+    // Column layout definitions are optional.
+    // However, we recommend that scopes define layouts for the best visual appearance.
+
+    // Single column layout
+    layout1col.add_column( { "image", "header", "summary" });
+
+    // Two column layout
+    layout2col.add_column( { "image" });
+    layout2col.add_column( { "header", "summary" });
+
+    // Three cokumn layout
+    layout3col.add_column( { "image" });
+    layout3col.add_column( { "header", "summary" });
+    layout3col.add_column( { });
+
+    // Register the layouts we just created
+    reply->register_layout( { layout1col, layout2col, layout3col });
+
+    // Define the header section
+    sc::PreviewWidget header("header", "header");
+    // It has title and a subtitle properties
+    header.add_attribute_mapping("title", "title");
+    header.add_attribute_mapping("subtitle", "subtitle");
+
+    // Define the image section
+    sc::PreviewWidget image("image", "image");
+    // It has a single source property, mapped to the result's art property
+    image.add_attribute_mapping("source", "art");
+
+    // Define the summary section
+    sc::PreviewWidget description("summary", "text");
+    // It has a text property, mapped to the result's description property
+    description.add_attribute_mapping("text", "description");
+
+    // Push each of the sections
+    reply->push( { image, header, description });
+}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp	2015-06-11 10:48:39 +0000
@@ -0,0 +1,269 @@
+#include <boost/algorithm/string/trim.hpp>
+
+#include <scope/localization.h>
+#include <scope/query.h>
+
+#include <unity/scopes/Annotation.h>
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/CategoryRenderer.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/SearchReply.h>
+
+#include <iomanip>
+#include <sstream>
+
+namespace sc = unity::scopes;
+namespace alg = boost::algorithm;
+
+using namespace std;
+using namespace api;
+using namespace scope;
+
+@if "%ContentType%" == "empty"
+/**
+ * Define the layout for theresults
+ *
+ * The icon size is medium, and ask for the card layout
+ * itself to be horizontal. I.e. the text will be placed
+ * next to the image.
+ */
+const static string CATEGORY_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-layout": "horizontal",
+    "card-size": "medium"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+@endif
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+/**
+ * Define the layout for the forecast results
+ *
+ * The icon size is small, and ask for the card layout
+ * itself to be horizontal. I.e. the text will be placed
+ * next to the image.
+ */
+const static string WEATHER_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-layout": "horizontal",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+
+/**
+ * Define the larger "current weather" layout.
+ *
+ * The icons are larger.
+ */
+const static string CITY_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "medium"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+@endif
+
+Query::Query(const sc::CannedQuery &query, const sc::SearchMetadata &metadata,
+        Config::Ptr config) :
+        sc::SearchQueryBase(query, metadata), client_(config) {
+}
+
+void Query::cancelled() {
+    client_.cancel();
+}
+
+@if "%ContentType%" == "empty"
+void Query::run(sc::SearchReplyProxy const& reply) {
+    try {
+        // Start by getting information about the query
+        const sc::CannedQuery &query(sc::SearchQueryBase::query());
+
+        // Trim the query string of whitespace
+        string query_string = alg::trim_copy(query.query_string());
+
+        // the Client is the helper class that provides the results
+        // without mixing APIs and scopes code.
+        // Add your code to retreive xml, json, or any other kind of result
+        // in the client.
+        Client::ResultList results;
+        if (query_string.empty()) {
+            // If the string is empty, pick a default
+            results = client_.search("default");
+        } else {
+            // otherwise, use the search string
+            results = client_.search(query_string);
+        }
+
+        // Register a category
+        auto cat = reply->register_category("results",
+                _("1 result", "%d results", results.size()), "",
+                sc::CategoryRenderer(CATEGORY_TEMPLATE));
+
+        for (const auto &result : results) {
+            sc::CategorisedResult res(cat);
+
+            // We must have a URI
+            res.set_uri(result.uri);
+
+            res.set_title(result.title);
+
+            // Set the rest of the attributes, art, description, etc
+            res.set_art(result.art);
+            res["subtitle"] = result.subtitle;
+            res["description"] = result.description;
+
+            // Push the result
+            if (!reply->push(res)) {
+                // If we fail to push, it means the query has been cancelled.
+                // So don't continue;
+                return;
+            }
+        }
+    } catch (domain_error &e) {
+        // Handle exceptions being thrown by the client API
+        cerr << e.what() << endl;
+        reply->error(current_exception());
+    }
+}
+@endif
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+void Query::run(sc::SearchReplyProxy const& reply) {
+    try {
+        // Start by getting information about the query
+        const sc::CannedQuery &query(sc::SearchQueryBase::query());
+
+        // Trim the query string of whitespace
+        string query_string = alg::trim_copy(query.query_string());
+
+        // the Client is the helper class that provides the results
+        // without mixing APIs and scopes code.
+        // Add your code to retreive xml, json, or any other kind of result
+        // in the client.
+        Client::Current current;
+        if (query_string.empty()) {
+            // If the string is empty, get the current weather for London
+            current = client_.weather("London,uk");
+        } else {
+            // otherwise, get the current weather for the search string
+            current = client_.weather(query_string);
+        }
+
+        // Build up the description for the city
+        stringstream ss(stringstream::in | stringstream::out);
+        ss << current.city.name << ", " << current.city.country;
+
+        // Register a category for the current weather, with the title we just built
+        auto location_cat = reply->register_category("current", ss.str(), "",
+                sc::CategoryRenderer(CITY_TEMPLATE));
+
+        {
+            // Create a single result for the current weather category
+            sc::CategorisedResult res(location_cat);
+
+            // We must have a URI
+            res.set_uri(to_string(current.city.id));
+
+            // Build up the description for the current weather
+            stringstream ss(stringstream::in | stringstream::out);
+            ss << setprecision(3) << current.weather.temp.cur;
+            ss << "°C";
+            res.set_title(ss.str());
+
+            // Set the rest of the attributes, art, description, etc
+            res.set_art(current.weather.icon);
+            res["subtitle"] = current.weather.description;
+            res["description"] = "A description of the result";
+
+            // Push the result
+            if (!reply->push(res)) {
+                // If we fail to push, it means the query has been cancelled.
+                // So don't continue;
+                return;
+            }
+        }
+
+        Client::Forecast forecast;
+        if (query_string.empty()) {
+            // If there is no search string, get the forecast for London
+            forecast = client_.forecast_daily("London,uk");
+        } else {
+            // otherwise, get the forecast for the search string
+            forecast = client_.forecast_daily(query_string);
+        }
+
+        // Register a category for the forecast
+        auto forecast_cat = reply->register_category("forecast",
+                _("7 day forecast"), "", sc::CategoryRenderer(WEATHER_TEMPLATE));
+
+        // For each of the forecast days
+        for (const auto &weather : forecast.weather) {
+            // Create a result
+            sc::CategorisedResult res(forecast_cat);
+
+            // We must have a URI
+            res.set_uri(to_string(weather.id));
+
+            // Build the description for the result
+            stringstream ss(stringstream::in | stringstream::out);
+            ss << setprecision(3) << weather.temp.max;
+            ss << "°C to ";
+            ss << setprecision(3) << weather.temp.min;
+            ss << "°C";
+            res.set_title(ss.str());
+
+            // Set the rest of the attributes
+            res.set_art(weather.icon);
+            res["subtitle"] = weather.description;
+            res["description"] = "A description of the result";
+
+            // Push the result
+            if (!reply->push(res)) {
+                // If we fail to push, it means the query has been cancelled.
+                // So don't continue;
+                return;
+            }
+        }
+
+    } catch (domain_error &e) {
+        // Handle exceptions being thrown by the client API
+        cerr << e.what() << endl;
+        reply->error(current_exception());
+    }
+}
+@endif

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/scope.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/scope.cpp	2015-06-11 10:48:39 +0000
@@ -0,0 +1,66 @@
+#include <scope/localization.h>
+#include <scope/preview.h>
+#include <scope/query.h>
+#include <scope/scope.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+namespace sc = unity::scopes;
+using namespace std;
+using namespace api;
+using namespace scope;
+
+void Scope::start(string const&) {
+    config_ = make_shared<Config>();
+
+    setlocale(LC_ALL, "");
+    string translation_directory = ScopeBase::scope_directory()
+            + "/../share/locale/";
+    bindtextdomain(GETTEXT_PACKAGE, translation_directory.c_str());
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+    // Under test we set a different API root
+    char *apiroot = getenv("NETWORK_SCOPE_APIROOT");
+    if (apiroot) {
+        config_->apiroot = apiroot;
+    }
+@endif
+}
+
+void Scope::stop() {
+}
+
+sc::SearchQueryBase::UPtr Scope::search(const sc::CannedQuery &query,
+        const sc::SearchMetadata &metadata) {
+    // Boilerplate construction of Query
+    return sc::SearchQueryBase::UPtr(new Query(query, metadata, config_));
+}
+
+sc::PreviewQueryBase::UPtr Scope::preview(sc::Result const& result,
+        sc::ActionMetadata const& metadata) {
+    // Boilerplate construction of Preview
+    return sc::PreviewQueryBase::UPtr(new Preview(result, metadata));
+}
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+// These functions define the entry points for the scope plugin
+extern "C" {
+
+EXPORT
+unity::scopes::ScopeBase*
+// cppcheck-suppress unusedFunction
+UNITY_SCOPE_CREATE_FUNCTION() {
+    return new Scope();
+}
+
+EXPORT
+void
+// cppcheck-suppress unusedFunction
+UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base) {
+    delete scope_base;
+}
+
+}

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,44 @@
+
+# Google Mock unfortunately has to be compiled from source
+include(FindGMock)
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+# We need process-cpp to launch the python test server
+pkg_check_modules(
+  TEST
+  process-cpp
+  REQUIRED
+)
+@endif
+
+# Include our test library headers
+include_directories(
+  ${GTEST_INCLUDE_DIRS}
+  ${GMOCK_INCLUDE_DIRS}
+  ${TEST_INCLUDE_DIRS}
+)
+
+# Where to find the scope ini file and .so
+add_definitions(
+  -DTEST_SCOPE_DIRECTORY="${CMAKE_BINARY_DIR}/src"
+)
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+file(GLOB_RECURSE
+  TEST_FIXTURES
+  "server/*" 
+)
+
+# Make this file show up in QtCreator
+add_custom_target(hidden_test_fixtures ALL
+  SOURCES ${TEST_FIXTURES}
+)
+
+# Where to find the test server binary
+add_definitions(
+  -DFAKE_SERVER="${CMAKE_CURRENT_SOURCE_DIR}/server/server.py"
+)
+@endif
+
+# Add the unit tests
+add_subdirectory(unit)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.json	2015-06-11 10:48:39 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.1117,"city":{"id":2643743,"name":"London","coord":{"lon":-0.12574,"lat":51.50853},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":23.33,"min":18.84,"max":25.09,"night":18.84,"eve":24.17,"morn":20.76},"pressure":1018.23,"humidity":83,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":1.87,"deg":295,"clouds":12,"rain":0.5},{"dt":1407499200,"temp":{"day":19.44,"min":15.54,"max":20.86,"night":15.54,"eve":18.28,"morn":16.21},"pressure":1010.57,"humidity":97,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":4.01,"deg":143,"clouds":92,"rain":8},{"dt":1407585600,"temp":{"day":18.78,"min":13.19,"max":19.58,"night":13.19,"eve":18.95,"morn":14.03},"pressure":1010.78,"humidity":83,"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"speed":5.46,"deg":281,"clouds":32},{"dt":1407672000,"temp":{"day":18.09,"min":13.46,"max":18.09,"night":13.46,"eve":16.58,"morn":13.91},"pressure":1002.33,"humidity":67,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.68,"deg":162,"clouds":92,"rain":4},{"dt":1407758400,"temp":{"day":17.38,"min":15.39,"max":17.38,"night":16.3,"eve":17.03,"morn":15.39},"pressure":1008.2,"humidity":0,"weather":[{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"}],"speed":13.52,"deg":245,"clouds":74,"rain":12.63},{"dt":1407844800,"temp":{"day":18.44,"min":16.17,"max":18.44,"night":16.83,"eve":18.02,"morn":16.17},"pressure":1009.94,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.93,"deg":251,"clouds":60,"rain":5.25},{"dt":1407931200,"temp":{"day":18.8,"min":16.67,"max":19.02,"night":16.77,"eve":19.02,"morn":16.67},"pressure":1013.17,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.88,"deg":275,"clouds":85,"rain":1.35}]}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.xml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.xml	2015-06-11 10:48:39 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<weatherdata>
+  <location>
+    <name>London</name>
+    <type/>
+    <country>GB</country>
+    <timezone/>
+    <location altitude="0" latitude="51.50853" longitude="-0.12574" geobase="geonames" geobaseid="0"/>
+  </location>
+  <credit/>
+  <meta>
+    <lastupdate/>
+    <calctime>0.1469</calctime>
+    <nextupdate/>
+  </meta>
+  <sun rise="2014-10-29T06:49:36" set="2014-10-29T16:38:47"/>
+  <forecast>
+    <time day="2014-10-29">
+      <symbol number="500" name="light rain" var="10d"/>
+      <precipitation value="2" type="rain"/>
+      <windDirection deg="54" code="NE" name="NorthEast"/>
+      <windSpeed mps="4.21" name="Gentle Breeze"/>
+      <temperature day="23.33" min="18.84" max="25.09" night="18.84" eve="24.17" morn="20.76"/>
+      <pressure unit="hPa" value="1020.35"/>
+      <humidity value="98" unit="%"/>
+      <clouds value="overcast clouds" all="92" unit="%"/>
+    </time>
+    <time day="2014-10-30">
+      <symbol number="500" name="moderate rain" var="10d"/>
+      <precipitation value="0.29" type="rain"/>
+      <windDirection deg="202" code="SSW" name="South-southwest"/>
+      <windSpeed mps="4.28" name="Gentle Breeze"/>
+      <temperature day="19.44" min="15.54" max="20.86" night="15.54" eve="18.28" morn="16.21"/>
+      <pressure unit="hPa" value="1010.57"/>
+      <humidity value="97" unit="%"/>
+      <clouds value="clear sky" all="5" unit="%"/>
+    </time>
+    <time day="2014-10-31">
+      <symbol number="802" name="scattered clouds" var="03d"/>
+      <precipitation/>
+      <windDirection deg="168" code="SSE" name="South-southeast"/>
+      <windSpeed mps="5.63" name="Moderate breeze"/>
+      <temperature day="18.78" min="13.19" max="19.58" night="13.19" eve="18.95" morn="14.03"/>
+      <pressure unit="hPa" value="1010.78"/>
+      <humidity value="83" unit="%"/>
+      <clouds value="few clouds" all="13" unit="%"/>
+    </time>
+    <time day="2014-11-01">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation value="0.61" type="rain"/>
+      <windDirection deg="198" code="SSW" name="South-southwest"/>
+      <windSpeed mps="7.49" name="Moderate breeze"/>
+      <temperature day="18.09" min="13.46" max="18.09" night="13.46" eve="16.58" morn="13.91"/>
+      <pressure unit="hPa" value="1002.33"/>
+      <humidity value="67" unit="%"/>
+      <clouds value="scattered clouds" all="40" unit="%"/>
+    </time>
+    <time day="2014-11-02">
+      <symbol number="502" name="heavy intensity rain" var="10d"/>
+      <precipitation value="2.44" type="rain"/>
+      <windDirection deg="169" code="S" name="South"/>
+      <windSpeed mps="9.31" name="Fresh Breeze"/>
+      <temperature day="17.38" min="15.39" max="17.38" night="16.3" eve="17.03" morn="15.39"/>
+      <pressure unit="hPa" value="1008.2"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="clear sky" all="9" unit="%"/>
+    </time>
+    <time day="2014-11-03">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation value="6.61" type="rain"/>
+      <windDirection deg="158" code="SSE" name="South-southeast"/>
+      <windSpeed mps="5.53" name="Moderate breeze"/>
+      <temperature day="18.44" min="16.17" max="18.44" night="16.83" eve="18.02" morn="16.17"/>
+      <pressure unit="hPa" value="1009.94"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="overcast clouds" all="90" unit="%"/>
+    </time>
+    <time day="2014-11-04">
+      <symbol number="500" name="light rain" var="10d"/>
+      <precipitation value="0.5" type="rain"/>
+      <windDirection deg="296" code="WNW" name="West-northwest"/>
+      <windSpeed mps="5.03" name="Gentle Breeze"/>
+      <temperature day="18.8" min="16.67" max="19.02" night="16.77" eve="19.02" morn="16.67"/>
+      <pressure unit="hPa" value="1013.17"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="broken clouds" all="75" unit="%"/>
+    </time>
+  </forecast>
+</weatherdata>
\ No newline at end of file

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.json	2015-06-11 10:48:39 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.0056,"city":{"id":2643123,"name":"Manchester","coord":{"lon":-2.23743,"lat":53.480949},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":17.91,"min":11.96,"max":18.83,"night":11.96,"eve":18.01,"morn":16.13},"pressure":1014.82,"humidity":77,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":3.32,"deg":303,"clouds":0},{"dt":1407499200,"temp":{"day":18.59,"min":12.33,"max":18.59,"night":12.33,"eve":14.55,"morn":14.69},"pressure":1008.22,"humidity":79,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":3.46,"deg":163,"clouds":92,"rain":11},{"dt":1407585600,"temp":{"day":15.8,"min":10.79,"max":17.11,"night":10.79,"eve":16.89,"morn":13.19},"pressure":1005.76,"humidity":92,"weather":[{"id":803,"main":"Clouds","description":"broken clouds","icon":"04d"}],"speed":5.61,"deg":279,"clouds":56},{"dt":1407672000,"temp":{"day":15.29,"min":12.21,"max":15.98,"night":12.41,"eve":15.98,"morn":12.21},"pressure":995.36,"humidity":95,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.75,"deg":137,"clouds":92,"rain":5},{"dt":1407758400,"temp":{"day":15.73,"min":12.99,"max":15.73,"night":13.8,"eve":15.23,"morn":12.99},"pressure":990.16,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.02,"deg":239,"clouds":99,"rain":1.15},{"dt":1407844800,"temp":{"day":17.64,"min":14.08,"max":17.64,"night":14.08,"eve":14.92,"morn":14.12},"pressure":992.52,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.36,"deg":240,"clouds":45,"rain":4.84},{"dt":1407931200,"temp":{"day":14.35,"min":13.37,"max":15.52,"night":13.77,"eve":15.52,"morn":13.37},"pressure":999.39,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":7.79,"deg":285,"clouds":92,"rain":5.98}]}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.xml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.xml	2015-06-11 10:48:39 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<weatherdata>
+  <location>
+    <name>Manchester</name>
+    <type/>
+    <country>GB</country>
+    <timezone/>
+    <location altitude="0" latitude="53.480949" longitude="-2.23743" geobase="geonames" geobaseid="0"/>
+  </location>
+  <credit/>
+  <meta>
+    <lastupdate/>
+    <calctime>0.0021</calctime>
+    <nextupdate/>
+  </meta>
+  <sun rise="2014-10-29T07:03:13" set="2014-10-29T16:42:04"/>
+  <forecast>
+    <time day="2014-10-29">
+      <symbol number="800" name="sky is clear" var="01d"/>
+      <precipitation value="1" type="rain"/>
+      <windDirection deg="113" code="ESE" name="East-southeast"/>
+      <windSpeed mps="3.86" name="Gentle Breeze"/>
+      <temperature day="17.91" min="11.96" max="18.83" night="11.96" eve="18.01" morn="16.13"/>
+      <pressure unit="hPa" value="1017.53"/>
+      <humidity value="92" unit="%"/>
+      <clouds value="broken clouds" all="80" unit="%"/>
+    </time>
+    <time day="2014-10-30">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation/>
+      <windDirection deg="182" code="S" name="South"/>
+      <windSpeed mps="5.01" name="Gentle Breeze"/>
+      <temperature day="18.59" min="12.33" max="18.59" night="12.33" eve="14.55" morn="14.69"/>
+      <pressure unit="hPa" value="1014.33"/>
+      <humidity value="97" unit="%"/>
+      <clouds value="overcast clouds" all="88" unit="%"/>
+    </time>
+    <time day="2014-10-31">
+      <symbol number="803" name="broken clouds" var="04d"/>
+      <precipitation value="1" type="rain"/>
+      <windDirection deg="178" code="S" name="South"/>
+      <windSpeed mps="7.01" name="Moderate breeze"/>
+      <temperature day="15.8" min="10.79" max="17.11" night="10.79" eve="16.89" morn="13.19"/>
+      <pressure unit="hPa" value="1012.52"/>
+      <humidity value="90" unit="%"/>
+      <clouds value="scattered clouds" all="36" unit="%"/>
+    </time>
+    <time day="2014-11-01">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation value="4" type="rain"/>
+      <windDirection deg="209" code="SSW" name="South-southwest"/>
+      <windSpeed mps="6.22" name="Moderate breeze"/>
+      <temperature day="15.29" min="12.21" max="15.98" night="12.41" eve="15.98" morn="12.21"/>
+      <pressure unit="hPa" value="1009.17"/>
+      <humidity value="97" unit="%"/>
+      <clouds value="overcast clouds" all="88" unit="%"/>
+    </time>
+    <time day="2014-11-02">
+      <symbol number="500" name="light rain" var="10d"/>
+      <precipitation value="8.18" type="rain"/>
+      <windDirection deg="166" code="SSE" name="South-southeast"/>
+      <windSpeed mps="9.75" name="Fresh Breeze"/>
+      <temperature day="15.73" min="12.99" max="15.73" night="13.8" eve="15.23" morn="12.99"/>
+      <pressure unit="hPa" value="997.47"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="broken clouds" all="77" unit="%"/>
+    </time>
+    <time day="2014-11-03">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation value="17.57" type="rain"/>
+      <windDirection deg="349" code="" name=""/>
+      <windSpeed mps="1.66" name="Light breeze"/>
+      <temperature day="17.64" min="14.08" max="17.64" night="14.08" eve="14.92" morn="14.12"/>
+      <pressure unit="hPa" value="992"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="overcast clouds" all="97" unit="%"/>
+    </time>
+    <time day="2014-11-04">
+      <symbol number="501" name="moderate rain" var="10d"/>
+      <precipitation/>
+      <windDirection deg="319" code="NW" name="Northwest"/>
+      <windSpeed mps="5.38" name="Gentle Breeze"/>
+      <temperature day="14.35" min="13.37" max="15.52" night="13.77" eve="15.52" morn="13.37"/>
+      <pressure unit="hPa" value="994.59"/>
+      <humidity value="0" unit="%"/>
+      <clouds value="broken clouds" all="56" unit="%"/>
+    </time>
+  </forecast>
+</weatherdata>

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/server.py'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/server.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/server.py	2015-06-11 10:48:39 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+import http.server
+import os
+import socketserver
+import sys
+from urllib.parse import urlparse,parse_qs
+
+def read_file(path):
+    file = os.path.join(os.path.dirname(__file__), path)
+    if os.path.isfile(file):
+        with open(file, 'r') as fp:
+            content = fp.read()
+    else:
+        content = ''
+
+    return content
+
+class MyRequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_GET(self):
+        sys.stderr.write("GET: %s\n" % self.path)
+        sys.stderr.flush()
+
+        parse = urlparse(self.path)
+        path = parse.path
+        query = parse_qs(parse.query)
+        
+        if path == '/data/2.5/weather':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+
+            mode = 'json'
+            if 'mode' in query:
+                mode = query['mode'][0]
+
+            self.wfile.write(bytes(read_file('weather/%s.%s' % (query['q'][0], mode)), 'UTF-8'))
+        elif path == '/data/2.5/forecast/daily':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+
+            mode = 'json'
+            if 'mode' in query:
+                mode = query['mode'][0]
+
+            self.wfile.write(bytes(read_file('forecast/daily/%s.%s' % (query['q'][0], mode)), 'UTF-8'))
+        else:
+            self.send_response(404)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+            self.wfile.write(bytes('ERROR', 'UTF-8'))
+
+if __name__ == "__main__":
+    Handler = MyRequestHandler
+    httpd = socketserver.TCPServer(("127.0.0.1", 0), Handler)
+
+    sys.stdout.write('%d\n' % httpd.server_address[1])
+    sys.stdout.flush()
+
+    httpd.serve_forever()
+

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.json	2015-06-11 10:48:39 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-0.13,"lat":51.51},"sys":{"type":1,"id":5091,"message":0.29,"country":"GB","sunrise":1407386057,"sunset":1407440289},"weather":[{"id":801,"main":"Clouds","description":"few clouds","icon":"02d"}],"base":"cmc stations","main":{"temp":21.83,"pressure":1014,"humidity":53,"temp_min":20,"temp_max":24},"wind":{"speed":1.5,"deg":0},"clouds":{"all":20},"dt":1407408276,"id":2643743,"name":"London","cod":200}
\ No newline at end of file

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.xml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.xml	2015-06-11 10:48:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<current>
+  <city id="2643743" name="London">
+    <coord lon="-0.13" lat="51.51"/>
+    <country>GB</country>
+    <sun rise="2014-10-29T06:49:37" set="2014-10-29T16:38:47"/>
+  </city>
+  <temperature value="21.83" min="20" max="24" unit="celsius"/>
+  <humidity value="53" unit="%"/>
+  <pressure value="1017" unit="hPa"/>
+  <wind>
+    <speed value="3.6" name="Gentle Breeze"/>
+    <direction value="90" code="E" name="East"/>
+  </wind>
+  <clouds value="75" name="broken clouds"/>
+  <visibility/>
+  <precipitation mode="no"/>
+  <weather number="801" value="few clouds" icon="02d"/>
+  <lastupdate value="2014-10-29T13:37:25"/>
+</current>
\ No newline at end of file

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.json	2015-06-11 10:48:39 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-2.24,"lat":53.48},"sys":{"type":1,"id":5060,"message":0.2423,"country":"GB","sunrise":1407386141,"sunset":1407441219},"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"base":"cmc stations","main":{"temp":17.35,"pressure":1016,"humidity":77,"temp_min":17,"temp_max":18},"wind":{"speed":2.6,"deg":20,"var_beg":330,"var_end":80},"clouds":{"all":40},"dt":1407408600,"id":2643123,"name":"Manchester","cod":200}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.xml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.xml	2015-06-11 10:48:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<current>
+<city id="2643123" name="Manchester">
+<coord lon="-2.24" lat="53.48"/>
+<country>GB</country>
+<sun rise="2014-10-29T07:03:13" set="2014-10-29T16:42:04"/>
+</city>
+<temperature value="17.35" min="17" max="18" unit="celsius"/>
+<humidity value="77" unit="%"/>
+<pressure value="1016" unit="hPa"/>
+<wind>
+<speed value="3.6" name="Gentle Breeze"/>
+<direction value="110" code="ESE" name="East-southeast"/>
+</wind>
+<clouds value="75" name="broken clouds"/>
+<visibility/>
+<precipitation mode="no"/>
+<weather number="802" value="scattered clouds" icon="03d"/>
+<lastupdate value="2014-10-29T15:59:18"/>
+</current>
\ No newline at end of file

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/CMakeLists.txt	2015-06-11 10:48:39 +0000
@@ -0,0 +1,31 @@
+
+# Our test executable.
+# It includes the object code from the scope
+add_executable(
+  scope-unit-tests
+  scope/test-scope.cpp
+  $<TARGET_OBJECTS:scope-static>
+)
+
+# Link against the scope, and all of our test lib dependencies
+target_link_libraries(
+  scope-unit-tests
+  ${GTEST_BOTH_LIBRARIES}
+  ${GMOCK_LIBRARIES}
+  ${SCOPE_LDFLAGS}
+  ${TEST_LDFLAGS}
+  ${Boost_LIBRARIES}
+)
+
+@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
+qt5_use_modules(
+  scope-unit-tests
+  Core
+)
+@endif
+
+# Register the test with CTest
+add_test(
+  scope-unit-tests
+  scope-unit-tests
+)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/scope/test-scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/scope/test-scope.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/scope/test-scope.cpp	2015-06-11 10:48:39 +0000
@@ -0,0 +1,232 @@
+#include <scope/scope.h>
+
+#include <core/posix/exec.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <string>
+#include <unity/scopes/SearchReply.h>
+#include <unity/scopes/SearchReplyProxyFwd.h>
+#include <unity/scopes/Variant.h>
+#include <unity/scopes/testing/Category.h>
+#include <unity/scopes/testing/MockSearchReply.h>
+#include <unity/scopes/testing/TypedScopeFixture.h>
+
+using namespace std;
+using namespace testing;
+using namespace scope;
+
+namespace posix = core::posix;
+namespace sc = unity::scopes;
+namespace sct = unity::scopes::testing;
+
+/**
+ * Keep the tests in an anonymous namespace
+ */
+namespace {
+
+/**
+ * Custom matcher to check the properties of search results
+ */
+MATCHER_P2(ResultProp, prop, value, "") {
+    if (arg.contains(prop)) {
+        *result_listener << "result[" << prop << "] is " << arg[prop].serialize_json();
+    } else {
+        *result_listener << "result[" << prop << "] is not set";
+    }
+    return arg.contains(prop) && arg[prop] == sc::Variant(value);
+}
+
+/**
+ * Custom matcher to check the presence of departments
+ */
+MATCHER_P(IsDepartment, department, "") {
+    return arg->serialize() == department->serialize();
+}
+
+typedef sct::TypedScopeFixture<Scope> TypedScopeFixtureScope;
+
+class TestScope: public TypedScopeFixtureScope {
+protected:
+@if "%ContentType%".substring(0, "network".length) === "network"
+    void SetUp() override
+    {
+        // Start up Python-based fake OpenWeatherMap server
+        fake_server_ = posix::exec("/usr/bin/python3", { FAKE_SERVER }, { },
+                posix::StandardStream::stdout);
+
+        // Check it's running
+        ASSERT_GT(fake_server_.pid(), 0);
+        string port;
+        // The server will print out the random port it is using
+        fake_server_.cout() >> port;
+        // Check we have a port
+        ASSERT_FALSE(port.empty());
+
+        // Build up the API root
+        string apiroot = "http://127.0.0.1:" + port;
+        // Override the API root that the scope will use
+        setenv("NETWORK_SCOPE_APIROOT", apiroot.c_str(), true);
+
+        // Do the parent SetUp
+        TypedScopeFixture::set_scope_directory(TEST_SCOPE_DIRECTORY);
+        TypedScopeFixtureScope::SetUp();
+    }
+
+    /**
+     * Start by assuming the server is invalid
+     */
+    posix::ChildProcess fake_server_ = posix::ChildProcess::invalid();
+ @endif
+};
+
+TEST_F(TestScope, empty_search_string) {
+@if "%ContentType%".substring(0, "network".length) === "network"
+    const sc::CategoryRenderer renderer;
+    NiceMock<sct::MockSearchReply> reply;
+
+    // Build a query with an empty search string
+    sc::CannedQuery query(SCOPE_NAME, "", "");
+
+    // Expect the current weather category
+    EXPECT_CALL(reply, register_category("current", "London, GB", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("current", "London, GB", "", renderer)));
+
+    // With one result
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "21.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/02d.png"),
+            ResultProp("subtitle", "few clouds")
+            )))).WillOnce(
+            Return(true));
+
+    // Expect the forecast category
+    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
+
+    // With seven results
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "25.1°C to 18.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "20.9°C to 15.5°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "19.6°C to 13.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
+            ResultProp("subtitle", "scattered clouds")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.1°C to 13.5°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.4°C to 15.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "heavy intensity rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.4°C to 16.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "19°C to 16.7°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+
+    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
+    sc::SearchMetadata meta_data("en_EN", "phone");
+
+    // Create a query object
+    auto search_query = scope->search(query, meta_data);
+    ASSERT_NE(nullptr, search_query);
+
+    // Run the search
+    search_query->run(reply_proxy);
+
+    // Google Mock will make assertions when the mocks are destructed.
+@endif
+}
+
+TEST_F(TestScope, search) {
+@if "%ContentType%".substring(0, "network".length) === "network"
+    const sc::CategoryRenderer renderer;
+    NiceMock<sct::MockSearchReply> reply;
+
+    // Build a query with a non-empty search string
+    sc::CannedQuery query(SCOPE_NAME, "Manchester,uk", "");
+
+    // Expect the current weather category
+    EXPECT_CALL(reply, register_category("current", "Manchester, GB", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("current", "Manchester, GB", "", renderer)));
+
+    // With one result
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
+            ResultProp("subtitle", "scattered clouds")
+            )))).WillOnce(
+            Return(true));
+
+    // Expect the forecast category
+    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
+
+    // With seven results
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.8°C to 12°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/01d.png"),
+            ResultProp("subtitle", "sky is clear")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.6°C to 12.3°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.1°C to 10.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/04d.png"),
+            ResultProp("subtitle", "broken clouds")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "16°C to 12.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "15.7°C to 13°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.6°C to 14.1°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "15.5°C to 13.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+
+    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
+    sc::SearchMetadata meta_data("en_EN", "phone");
+
+    // Create a query object
+    auto search_query = scope->search(query, meta_data);
+    ASSERT_NE(nullptr, search_query);
+
+    // Run the search
+    search_query->run(reply_proxy);
+
+    // Google Mock will make assertions when the mocks are destructed.
+@endif
+}
+
+} // namespace

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/wizard.xml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/wizard.xml	2015-06-11 10:48:39 +0000
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wizard version="1" kind="project" firstpage="10" id="C_UbuntuUnityScope" category="A.UbuntuProject"
+        platformIndependent="true" 
+        class="ubuntu-project-cmake"
+        featuresRequired=""
+        >
+    <icon>../share/ubuntu.png</icon>
+    <description>A simple C++ based Unity Scope</description>
+    <displayname>Unity Scope (14.10)</displayname>
+    <displaycategory>Ubuntu</displaycategory>
+    <files>
+        <file source="cmake/FindGMock.cmake"/>
+        <file source="cmake/FindIntltool.cmake"/>
+
+        <file source="data/CMakeLists.txt"/>
+        <file source="data/displayName.ini.in" target="data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in"/>
+        <file source="data/icon.png" binary="true"/>
+        <file source="data/logo.png" binary="true"/>
+        <file source="data/screenshot.png" binary="true"/>
+
+        <file source="include/api/config.h"/>
+        <file source="include/api/client.h"/>
+        <file source="include/scope/localization.h"/>
+        <file source="include/scope/preview.h"/>
+        <file source="include/scope/query.h"/>
+        <file source="include/scope/scope.h"/>
+
+        <file source="src/CMakeLists.txt"/>
+        <file source="src/api/client.cpp"/>
+        <file source="src/scope/query.cpp"/>
+        <file source="src/scope/scope.cpp" openeditor="true"/>
+        <file source="src/scope/preview.cpp"/>
+
+        <file source="po/CMakeLists.txt"/>
+        <file source="po/displayName.pot" target="po/%ProjectName:l%.pot"/>
+        <file source="po/Makefile.in.in"/>
+        <file source="po/POTFILES.in"/>
+
+        <file source="tests/server/forecast/daily/Manchester,uk.json"/>
+        <file source="tests/server/forecast/daily/Manchester,uk.xml"/>
+        <file source="tests/server/forecast/daily/London,uk.json"/>
+        <file source="tests/server/forecast/daily/London,uk.xml"/>
+        <file source="tests/server/weather/Manchester,uk.json"/>
+        <file source="tests/server/weather/Manchester,uk.xml"/>
+        <file source="tests/server/weather/London,uk.json"/>
+        <file source="tests/server/weather/London,uk.xml"/>
+        <file source="tests/server/server.py"/>
+        <file source="tests/CMakeLists.txt"/>
+        <file source="tests/unit/CMakeLists.txt"/>
+        <file source="tests/unit/scope/test-scope.cpp"/>
+
+        <file source="CMakeLists.txt" openproject="true"/>
+        <file source="displayName.apparmor" target="%ClickHookName:l%.apparmor"/>
+        <file source="manifest.json.in" openeditor="true"/>
+        <file source="readme.txt"/>
+    </files>
+
+    <!-- Create a 2nd wizard page with click package parameters -->
+    <fieldpagetitle>Click package parameters</fieldpagetitle>
+    <fields>
+			<field mandatory="true" name="ClickDomain">
+			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+			                defaulttext="" placeholdertext="Nickname"/>
+			  <fielddescription>Nickname:</fielddescription>
+			</field>
+        <field mandatory="true" name="ClickMaintainer">
+            <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+            <fielddescription>Maintainer:</fielddescription>
+        </field>
+        <field mandatory="true" name="ClickHookName">
+            <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="myscope" placeholdertext="scope hook name"/>
+            <fielddescription>Scope name:</fielddescription>
+        </field>
+				<field name="ClickFrameworkVersion">
+				    <fieldcontrol class="QComboBox" defaultindex="0">
+				        <comboentries>
+									<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+									<comboentry value="ubuntu-sdk-dummy-framework">
+				              <comboentrytext>Dummy Framework</comboentrytext>
+				          </comboentry>
+				        </comboentries>
+				    </fieldcontrol>
+				    <fielddescription>Framework:</fielddescription>
+				</field>
+        <field name="ConfinementType">
+            <fieldcontrol class="QComboBox" defaultindex="0">
+                <comboentries>
+                    <comboentry value="ubuntu-scope-network">
+                        <comboentrytext>Scope with network access</comboentrytext>
+                    </comboentry>
+                    <!--
+                    <comboentry value="ubuntu-scope-local-content">
+                        <comboentrytext>Scope with local content</comboentrytext>
+                    </comboentry>
+                    -->
+                </comboentries>
+            </fieldcontrol>
+            <fielddescription>Confinement type:</fielddescription>
+        </field>
+        <field name="ContentType">
+            <fieldcontrol class="QComboBox" defaultindex="0">
+                <comboentries>
+                    <comboentry value="network-netcpp-qjson">
+                        <comboentrytext>Qt scope using HTTP+JSON API</comboentrytext>
+                    </comboentry>
+                    <comboentry value="network-netcpp-qxml">
+                        <comboentrytext>Qt scope using HTTP+XML API</comboentrytext>
+                    </comboentry>
+                    <comboentry value="network-netcpp-json">
+                        <comboentrytext>Pure C++ scope using HTTP+JSON API</comboentrytext>
+                    </comboentry>
+                    <comboentry value="empty">
+                        <comboentrytext>Empty scope</comboentrytext>
+                    </comboentry>
+                </comboentries>
+            </fieldcontrol>
+            <fielddescription>Template type:</fielddescription>
+        </field>
+    </fields>
+    <validationrules>
+        <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
+            <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
+        </validationrule>
+    </validationrules>
+</wizard>

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-05-14 10:48:33 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-06-11 10:48:39 +0000
@@ -6,7 +6,7 @@
         >
     <icon>../share/ubuntu.png</icon>
     <description>A simple C++ based Unity Scope</description>
-    <displayname>Unity Scope (cmake)</displayname>
+    <displayname>Unity Scope (Current)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
         <file source="src/CMakeLists.txt"/>