Merge lp:~alan-griffiths/miral/purge-miral-qt into lp:miral

[Alan Griffiths]

[miral-qt] delete all as qtmir work on MirAL has shifted to lp:~unity-team/qtmir/miral-qt-integration and this is a needless distration

[Daniel d'Andrada (dandrader)]

Thumbs up

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-28 11:23:53 +0000
+++ CMakeLists.txt	2016-11-07 14:51:54 +0000
@@ -65,11 +65,6 @@
 endif()
 endif()
 
-option(MIRAL_ENABLE_QT "Build Qt integration" OFF)
-if (MIRAL_ENABLE_QT)
-    add_subdirectory(miral-qt)
-endif()
-
 include (cmake/Doxygen.cmake)
 
 if(TARGET doc)

=== removed directory 'miral-qt'
=== removed file 'miral-qt/CMakeLists.txt'
--- miral-qt/CMakeLists.txt	2016-11-01 19:33:51 +0000
+++ miral-qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-project(qtmir)
-
-set(QTMIR_VERSION_MAJOR 0)
-set(QTMIR_VERSION_MINOR 1)
-set(QTMIR_VERSION_PATCH 0)
-
-if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
-   message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt and CMakeFiles/ from source root and try again.")
-endif()
-
-set(MIRAL_QT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-find_package (ECM 1.7.0 QUIET NO_MODULE)
-if (ECM_FOUND)
-    # Provides us with -DECM_ENABLE_SANITIZERS='X'
-    # Where X can be address, thread, memory, leak, undefined
-    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
-endif()
-
-# add custom cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-
-# FIXME - am not inheriting the C/CXXFlags from parent as too strict & fails to build
-set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wextra -Werror")
-set(CMAKE_CXX_FLAGS "-std=c++14 -fPIC -Wall -fno-strict-aliasing -Werror -Wextra")
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
-
-if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-mismatched-tags -Wno-inconsistent-missing-override -Wno-implicit-exception-spec-mismatch -Wno-unknown-pragmas")
-endif()
-
-
-include(EnableCoverageReport)
-#####################################################################
-# Enable code coverage calculation with gcov/gcovr/lcov
-# Usage:
-#  * Switch build type to coverage (use ccmake or cmake-gui)
-#  * Invoke make, make test, make coverage (or ninja if you use that backend)
-#  * Find html report in subdir coveragereport
-#  * Find xml report feasible for jenkins in coverage.xml
-#####################################################################
-if(cmake_build_type_lower MATCHES coverage)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" )
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage" )
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage" )
-    ENABLE_COVERAGE_REPORT(TARGETS ${SHELL_APP} FILTER /usr/include ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
-endif()
-
-# Make sure we have all the needed symbols
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,defs")
-
-# Static C++ checks
-add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
-                                       ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
-
-include(FindPkgConfig)
-find_package(Qt5Core 5.4 REQUIRED)
-find_package(Qt5DBus 5.4 REQUIRED)
-find_package(Qt5Gui 5.4 REQUIRED)
-find_package(Qt5Qml 5.4 REQUIRED)
-find_package(Qt5Quick 5.4 REQUIRED)
-find_package(Qt5Sensors 5.4 REQUIRED)
-find_package(Qt5Test 5.4 REQUIRED)
-
-find_package(Threads REQUIRED)
-
-pkg_check_modules(MIRSERVER mirserver>=0.22 REQUIRED)
-pkg_check_modules(MIRCLIENT mirclient>=0.22 REQUIRED)
-pkg_check_modules(MIRRENDERERGLDEV mir-renderer-gl-dev>=0.22 REQUIRED)
-
-# Reformat ${MIRSERVER_CFLAGS} to use with set_source_files_properties()
-string(REPLACE ";" " " FIXME_MIRSERVER_CXXFLAGS "${MIRSERVER_CFLAGS}")
-
-pkg_check_modules(XKBCOMMON xkbcommon REQUIRED)
-pkg_check_modules(GLIB glib-2.0 REQUIRED)
-pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
-pkg_check_modules(UBUNTU_APP_LAUNCH ubuntu-app-launch-2 REQUIRED)
-pkg_check_modules(URL_DISPATCHER url-dispatcher-1)
-pkg_check_modules(EGL egl)
-pkg_check_modules(GIO gio-2.0)
-pkg_check_modules(GIO_UNIX gio-unix-2.0)
-pkg_check_modules(LTTNG lttng-ust)
-pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
-pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
-pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
-pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
-pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
-
-include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
-
-
-# Use the fast string builder
-add_definitions(-DQT_USE_QSTRINGBUILDER)
-
-# We expect this to be set via debian/rules for GLES builds
-if ("${USE_OPENGLES}" STREQUAL 1)
-    message(STATUS "Qt5 determined to be compiled with GLES support")
-    pkg_check_modules(GLESv2 glesv2)
-    add_definitions(-DQT_USING_GLES)
-    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
-    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
-# Because qt/gl and qt/gles are not parallel installable we have a difficulty
-# building qtmir-desktop on armhf. We would like to link against opengl and bind the
-# opengl API but Qt is already linked against the ES APIs. So in this setup we link against OpenGLES
-# to accomodate Qt but bind the OpenGL API anyway. This is technically broken though
-# I suspect Mesa may allow it ~racarr.
-elseif("${USE_OPENGL_BUT_LINK_AGAINST_OPENGLES}")
-    message(STATUS "Linking against OpenGL ES but binding OpenGL API")
-    pkg_check_modules(GLESv2 glesv2)
-    add_definitions(-DQT_USING_GL)
-    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
-    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
-else()
-    message(STATUS "Qt5 determined to be compiled with OpenGL support")
-    pkg_check_modules(GL gl)
-    add_definitions(-DQT_USING_OPENGL)
-    include_directories (SYSTEM ${GL_INCLUDE_DIRS})
-endif()
-
-# Standard install paths
-include(GNUInstallDirs)
-
-
-# Determine QPA plugin install path
-# FIXME(greyback) there must be a better way than calling a private macro to set a property.
-# I'm manually calling a macro from Qt5GuiConfig.cmake, but I don't understand why it isn't being called.
-_populate_Gui_plugin_properties("Gui" "PLATFORMS" "platforms")
-get_target_property(Qt5Gui_QPA_Plugin_Path Qt5::Gui IMPORTED_LOCATION_PLATFORMS)
-
-# Set QML module install path
-set(QML_MODULE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/qt5/qml")
-set(QTMIR_DATA_DIR ${CMAKE_INSTALL_DATADIR}/qtmir)
-
-
-# Customisations for the build type
-if(NOT CMAKE_BUILD_TYPE)
-    message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
-    set(CMAKE_BUILD_TYPE RelWithDebInfo)
-endif()
-
-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
-
-if(cmake_build_type_lower MATCHES relwithdebinfo) # workaround for http://public.kitware.com/Bug/view.php?id=14696
-    add_definitions(-DQT_NO_DEBUG)
-endif()
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
-    option(Werror "Treat warnings as errors" ON)
-else()
-    option(Werror "Treat warnings as errors" OFF)
-endif()
-
-if (Werror)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-endif()
-
-
-# Mir uses boost, which does not like Qt defining macros named "signals" and "slots"
-add_definitions(-DQT_NO_KEYWORDS)
-
-# Tests
-if (NOT NO_TESTS)
-    include(CTest)
-    enable_testing()
-    add_subdirectory(tests)
-else()
-    message(STATUS "Tests disabled")
-endif()
-
-# add subdirectories to build
-add_subdirectory(src)
-add_subdirectory(demos)
-add_subdirectory(benchmarks)

=== removed file 'miral-qt/README'
--- miral-qt/README	2016-06-01 22:06:51 +0000
+++ miral-qt/README	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-This repo contains a QPA plugin to make Qt a Mir server.
-
-Handy way to grab dependencies is with:
-$ sudo mk-build-deps -ir debian/control
-
-To use, compile and install (building in a "build" subdir as an example):
-$ mkdir build
-$ cd build
-$ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
-$ make
-$ sudo make install
-
-To enable debug output, replace the single "cmake" command with
-$ cmake -DCMAKE_BUILD_TYPE=Debug
-(is good to "make clean" beforehand)
-
-To avoid building the tests (to speed up the build):
-$ cmake -DNO_TESTS=true
-
-To enable logging of Qt's OpenGL debug messages:
-$ cmake -DQGL_DEBUG=true
-
-To test the server, enter the demos directory, and run (NB: server should be run as root):
-
-$ sudo su
-$ export QT_QPA_PLATFORM=mirserver
-$ export MIR_SERVER_FILE=/tmp/mir_socket
-$ unset QT_QPA_PLATFORMTHEME
-
-then run the Qt application of your choice (qmlscene best). As example, try
-
-$ qmlscene qml-demo-shell/qml-demo-shell.qml
-
-prepare the environment for running mir clients:
-
-$ sudo chmod a+rw /tmp/mir_socket
-$ export MIR_SOCKET=/tmp/mir_socket
-
-and then try running an application:
-
-$ mir_demo_client_egltriangle --desktop_file_hint=/usr/share/applications/gallery-app.desktop
-or
-$ unset QT_QPA_PLATFORMTHEME
-$ export QT_QPA_PLATFORM=ubuntumirclient
-$ qmlscene qml-demo-client/qml-demo-client.qml --desktop_file_hint=/usr/share/click/preinstalled/com.ubuntu.calendar/0.4.172/calendar-app.desktop
-
-where the desktop file hint specifies an existing file.

=== removed directory 'miral-qt/benchmarks'
=== removed file 'miral-qt/benchmarks/CMakeLists.txt'
--- miral-qt/benchmarks/CMakeLists.txt	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-file(GLOB BENCHMARK_FILES
-	*.py
-	*.R
-)
-
-install(FILES ${BENCHMARK_FILES}
-    DESTINATION ${QTMIR_DATA_DIR}/benchmarks
-)

=== removed file 'miral-qt/benchmarks/README'
--- miral-qt/benchmarks/README	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/README	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-To run performance tests on device:
-
-Firstly, you will need to install the qtmir-tests package. So either install the package using apt or build
-and install from source
-$ sudo apt-get install qtmir-tests
-
-Then you need to stop unity8 & unity-system compositor so that we can start out test in a controlled environment.
-$ sudo stop lightdm
-
-Next, start the test!
-$ cd benchmarks
-$ sudo python3 touch_event_latency.py
\ No newline at end of file

=== removed file 'miral-qt/benchmarks/common.py'
--- miral-qt/benchmarks/common.py	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/common.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2015 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 as published by
-# the Free Software Foundation; version 3.
-#
-# 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/>.
-
-from autopilot import (
-    input,
-    platform
-)
-
-def get_pointing_device():
-    """Return the pointing device depending on the platform.
-
-    If the platform is `Desktop`, the pointing device will be a `Mouse`.
-    If not, the pointing device will be `Touch`.
-
-    """
-    if platform.model() == 'Desktop':
-        input_device_class = input.Mouse
-    else:
-        input_device_class = input.Touch
-    return input.Pointer(device=input_device_class.create())
\ No newline at end of file

=== removed file 'miral-qt/benchmarks/report_types.py'
--- miral-qt/benchmarks/report_types.py	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/report_types.py	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2015 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 as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import subprocess
-import os
-import shutil
-
-class Node:
-    def __init__(self, name):
-        self.name = name
-        self.children = []
-    
-    def add_child(self, child):
-        self.children.append(child)
-
-    def to_string(self):
-        output = "<%s>" % self.name
-        for child in self.children:
-            output += child.to_string()
-        output += "</%s>" % self.name
-        return output
-
-class Results(Node):
-    def __init__(self):
-        super().__init__("results")
-
-class Events(Node):
-    def __init__(self):
-        super().__init__("events")
-
-class Event:
-    def __init__(self, event):
-        self.pid = event["vpid"]
-        self.name = event.name
-        self.timestamp = event.timestamp
-
-    def to_string(self):
-        output = "<event "
-        output += "pid='{}' ".format(self.pid)
-        output += "name='{}' ".format(self.name)
-        output += "timestamp='{}' ".format(self.timestamp)
-        output += "/>"
-        return output
-
-class Processes(Node):
-    def __init__(self):
-        super().__init__("processes")
-
-class Process:
-    def __init__(self, name, pid):
-        self.name = name
-        self.pid = pid
-
-    def to_string(self):
-        output = "<process "
-        output += "name='{}' ".format(self.name)
-        output += "pid='{}' ".format(self.pid)
-        output += "/>"
-        return output
-
-class ResultsData:
-    def __init__(self, name, mean=0.0, deviation=0.0, comment=""):
-        self.data = []
-        self.name = name
-        self.mean = mean
-        self.deviation = deviation
-        self.comment = comment
-
-    def add_data(self, value):
-        self.data.append(value)
-
-    def to_string(self):
-        output = "<data name='{}' mean='{}' deviation='{}' comment='{}' count='{}'>".format(
-            self.name,
-            self.mean,
-            self.deviation, 
-            self.comment, 
-            len(self.data))
-        output += "<values>"
-        output += ",".join(map( lambda x: str(x), self.data))
-        output += "</values>"
-        output += "</data>"
-        return output;
-
-    def generate_histogram(self, filename):
-        cmdline = [
-            shutil.which("Rscript"),
-            os.path.split(os.path.abspath(__file__))[0] + "/touch_event_latency.R",
-            "data.csv",
-            "%s.png" % filename]
-        # Use R to generate a histogram plot
-        f = open("data.csv", "w")
-        f.write(",".join(map( lambda x: str(x), self.data)));
-        f.close()
-        process = subprocess.Popen(cmdline)
-        process.wait()
-        if process.returncode != 0:
-            print("Failed to generate histogram");
-        os.remove("data.csv")
-
-
-class Error:    
-    def __init__(self, comment):
-        self.comment = comment
-
-    def to_string(self):
-        return "<error comment='{}' />".format(self.comment)
-        return output
\ No newline at end of file

=== removed file 'miral-qt/benchmarks/touch_event_latency.R'
--- miral-qt/benchmarks/touch_event_latency.R	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/touch_event_latency.R	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-args <- commandArgs(trailingOnly = TRUE)
-data <- scan(args[1], numeric(), sep=",")
-colors = c("red", "yellow", "green", "violet", "orange", "pink", "blue")
-png(filename=args[2])
-hist(data, breaks=max(data), col=colors)
-dev.off()

=== removed file 'miral-qt/benchmarks/touch_event_latency.py'
--- miral-qt/benchmarks/touch_event_latency.py	2016-06-01 22:06:51 +0000
+++ miral-qt/benchmarks/touch_event_latency.py	1970-01-01 00:00:00 +0000
@@ -1,271 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2015 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 as published by
-# the Free Software Foundation; version 3.
-#
-# 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/>.
-
-from mir_perf_framework import PerformanceTest, Server, Client
-import time
-import statistics
-import shutil
-import sys
-from common import get_pointing_device
-import report_types
-
-####### TEST #######
-
-
-def perform_test():
-    host = Server(reports=["input"])
-    nested = Server(executable=shutil.which("qtmir-demo-shell"),
-                    host=host,
-                    reports=["input","client-input-receiver"],
-                    env={"QT_QPA_PLATFORM": "mirserver", "QML_NO_TOUCH_COMPRESSION": "1"})
-    client = Client(executable=shutil.which("qtmir-demo-client"),
-                    server=nested,
-                    reports=["input","client-input-receiver"],
-                    env={"QT_QPA_PLATFORM": "ubuntumirclient", "QML_NO_TOUCH_COMPRESSION": "1"},
-                    options=["--", "--desktop_file_hint=/usr/share/applications/qtmir-demo-client.desktop"])
-
-    test = PerformanceTest([host, nested, client])
-    test.start()
-
-    results = report_types.Results()
-    processes = report_types.Processes()
-    processes.add_child(report_types.Process("Host", host.process.pid))
-    processes.add_child(report_types.Process("Nested Server", nested.process.pid))
-    processes.add_child(report_types.Process("Client", client.process.pid))
-    results.add_child(processes)
-
-    time.sleep(3) # wait for settle
-
-    host_pid = host.process.pid
-    nested_pid = nested.process.pid
-    client_pid = client.process.pid
-
-    touch = get_pointing_device()
-    time.sleep(1) # let mir pick up the new input device
-    touch.drag(100, 100, 1000, 100, 5, 0.006)
-    touch.drag(1000, 100, 1000, 1000, 5, 0.006)
-    touch.drag(1000, 1000, 100, 1000, 5, 0.006)
-    touch.drag(100, 1000, 100, 100, 5, 0.006)
-
-    # time.sleep(5) # wait for settle
-    time.sleep(2) # wait for settle
-    test.stop()
-
-    ####### TRACE PARSING #######
-
-    trace = test.babeltrace()
-
-    server_touch_data_timestamps = {}
-    client_touch_data_timestamps = {}
-    client_touch_data_latency = {}
-
-    qtmir_touch_dispatch_start = {}
-    qtmir_touch_dispatch_end = {}
-    qtmir_touch_consume_start = {}
-    qtmir_touch_consume_end = {}
-
-    events = report_types.Events()
-
-    for event in trace.events:
-        events.add_child(report_types.Event(event))
-        pid = event["vpid"]
-        if event.name == "mir_client_input_receiver:touch_event":
-            if pid not in client_touch_data_timestamps: client_touch_data_timestamps[pid] = []
-            if pid not in client_touch_data_latency: client_touch_data_latency[pid] = []
-            diff = (event.timestamp - event["event_time"]) / 1000000.0
-            if diff > 0:
-                client_touch_data_timestamps[pid].append(event.timestamp)
-                client_touch_data_latency[pid].append(diff)
-
-        elif event.name == "mir_server_input:published_motion_event":
-            if pid not in server_touch_data_timestamps: server_touch_data_timestamps[pid] = []
-            server_touch_data_timestamps[pid].append(event["event_time"])
-
-        elif event.name == "qtmirserver:touchEventDispatch_start":
-            if pid not in qtmir_touch_dispatch_start: qtmir_touch_dispatch_start[pid] = []
-            qtmir_touch_dispatch_start[pid].append(event.timestamp)
-
-        elif event.name == "qtmirserver:touchEventDispatch_end":
-            if pid not in qtmir_touch_dispatch_end: qtmir_touch_dispatch_end[pid] = []
-            qtmir_touch_dispatch_end[pid].append(event.timestamp)
-
-        elif event.name == "qtmir:touchEventConsume_start":
-            if pid not in qtmir_touch_consume_start: qtmir_touch_consume_start[pid] = []
-            qtmir_touch_consume_start[pid].append(event.timestamp)
-
-        elif event.name == "qtmir:touchEventConsume_end":
-            if pid not in qtmir_touch_consume_end: qtmir_touch_consume_end[pid] = []
-            qtmir_touch_consume_end[pid].append(event.timestamp)
-
-    # LATENCY MEANS
-
-    if nested_pid in client_touch_data_latency:
-        nested_data = client_touch_data_latency[nested_pid]
-        nested_latency_xml = report_types.ResultsData(
-            "nested_latency",
-            statistics.mean(nested_data),
-            statistics.stdev(nested_data),
-            "Kernel to nested server latency")
-        for value in nested_data:
-            nested_latency_xml.add_data(value)
-        results.add_child(nested_latency_xml)
-        nested_latency_xml.generate_histogram("nested_latency")
-    else:
-        results.add_child(report_types.Error("No nested server touch latency data"))
-
-    if client_pid in client_touch_data_latency:
-        client_data = client_touch_data_latency[client_pid]
-
-        client_latency_xml = report_types.ResultsData(
-            "client_latency",
-            statistics.mean(client_data),
-            statistics.stdev(client_data),
-            "Kernel to client latency")
-        for value in client_data:
-            client_latency_xml.add_data(value)
-        results.add_child(client_latency_xml)
-        client_latency_xml.generate_histogram("client_latency")
-    else:
-        results.add_child(report_types.Error("No client touch latency data"))
-
-    # EVENT RATES
-    if host_pid in server_touch_data_timestamps:
-        last_timestamp = -1
-        input_rate = []
-
-        for next_timestamp in server_touch_data_timestamps[host_pid]:
-            if last_timestamp != -1:
-                diff = (next_timestamp - last_timestamp) / 1000000.0
-                input_rate.append(diff)
-            last_timestamp = next_timestamp
-
-        input_rate_xml = report_types.ResultsData(
-            "host_input_ate",
-            statistics.mean(input_rate),
-            statistics.stdev(input_rate),
-            "Host input event rate")
-        for value in input_rate:
-            input_rate_xml.add_data(value)
-        results.add_child(input_rate_xml)
-        input_rate_xml.generate_histogram("host_input_rate")
-    else:
-        results.add_child(report_types.Error("No host server input event timestamp data"))
-
-    if nested_pid in client_touch_data_timestamps:
-        last_timestamp = -1
-        input_rate = []
-        for next_timestamp in client_touch_data_timestamps[nested_pid]:
-            if last_timestamp != -1:
-                diff = (next_timestamp - last_timestamp) / 1000000.0
-                input_rate.append(diff)
-            last_timestamp = next_timestamp
-
-        input_rate_xml = report_types.ResultsData(
-            "nested_input_rate",
-            statistics.mean(input_rate),
-            statistics.stdev(input_rate),
-            "Nested server event rate")
-        for value in input_rate:
-            input_rate_xml.add_data(value)
-        results.add_child(input_rate_xml)
-        input_rate_xml.generate_histogram("nested_input_rate")
-    else:
-        results.add_child(report_types.Error("No nested server input event timestamp data"))
-
-    if client_pid in client_touch_data_timestamps:
-        last_timestamp = -1
-        input_rate = []
-        for next_timestamp in client_touch_data_timestamps[client_pid]:
-            if last_timestamp != -1:
-                diff = (next_timestamp - last_timestamp) / 1000000.0
-                input_rate.append(diff)
-            last_timestamp = next_timestamp
-
-        input_rate_xml = report_types.ResultsData(
-            "client_input_rate",
-            statistics.mean(input_rate),
-            statistics.stdev(input_rate),
-            "Client event rate")
-        for value in input_rate:
-            input_rate_xml.add_data(value)
-        results.add_child(input_rate_xml)
-        input_rate_xml.generate_histogram("client_input_rate")
-    else:
-        results.add_child(report_types.Error("No client event timestamp data"))
-
-    qtmir_loop_data = []
-    dispatch_data = []
-    consume_data = []
-
-    # TIME BETWEEN TRACEPOINTS
-    dispatch_starts = qtmir_touch_dispatch_start[nested_pid] if nested_pid in qtmir_touch_dispatch_start else []
-    dispatch_ends = qtmir_touch_dispatch_end[nested_pid] if nested_pid in qtmir_touch_dispatch_end else []
-    consume_starts = qtmir_touch_consume_start[nested_pid] if nested_pid in qtmir_touch_consume_start else []
-    consume_ends = qtmir_touch_consume_end[nested_pid] if nested_pid in qtmir_touch_consume_end else []
-
-    # since there's no uniqueness to events, we need to assume all events are 1:1 through system
-    if len(dispatch_starts) > 0 and len(dispatch_starts) == len(dispatch_ends) and len(dispatch_starts) == len(consume_starts) and len(consume_starts) == len(consume_ends):
-        i = 0
-
-        for start in dispatch_starts:
-            dispatch_diff = (dispatch_ends[i] - start) / 1000000.0
-            consume_diff = (consume_ends[i] - consume_starts[i]) / 1000000.0
-            loop_dif = (consume_starts[i] - dispatch_ends[i]) / 1000000.0
-            dispatch_data.append(dispatch_diff);
-            consume_data.append(consume_diff);
-            qtmir_loop_data.append(loop_dif);
-            i=i+1
-
-        qtmir_loop_xml = report_types.ResultsData(
-            "qtmir_eventloop",
-            statistics.mean(qtmir_loop_data),
-            statistics.stdev(qtmir_loop_data),
-            "Time spent in qtmir event loop")
-        for value in qtmir_loop_data:
-            qtmir_loop_xml.add_data(value)
-        results.add_child(qtmir_loop_xml)
-        qtmir_loop_xml.generate_histogram("qtmir_eventloop")
-
-        qtmir_dispatch_xml = report_types.ResultsData(
-            "qtmir_dispatch",
-            statistics.mean(dispatch_data),
-            statistics.stdev(dispatch_data),
-            "Time QteventFeeder spent dispatching event to qt")
-        for value in dispatch_data:
-            qtmir_dispatch_xml.add_data(value)
-        results.add_child(qtmir_dispatch_xml)
-        qtmir_dispatch_xml.generate_histogram("qtmir_dispatch")
-
-        qtmir_consume_xml = report_types.ResultsData(
-            "qtmir_consume",
-            statistics.mean(consume_data),
-            statistics.stdev(consume_data),
-            "Time MirSurfaceItem spent consiming event")
-        for value in consume_data:
-            qtmir_consume_xml.add_data(value)
-        results.add_child(qtmir_consume_xml)
-        qtmir_consume_xml.generate_histogram("qtmir_consume")
-
-    else:
-        results.add_child(report_types.Error("Cannot calculate QtMir loop data - Dispatch event count did not match surface consume event count"))
-
-    results.add_child(events)
-    return results
-
-if __name__ == "__main__":
-    results = perform_test();
-    f = open("touch_event_latency.xml", "w")
-    f.write(results.to_string())

=== removed directory 'miral-qt/cmake'
=== removed directory 'miral-qt/cmake/modules'
=== removed file 'miral-qt/cmake/modules/FindGLESv2.cmake'
--- miral-qt/cmake/modules/FindGLESv2.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/FindGLESv2.cmake	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# - Try to find GLESv2
-# Once done this will define
-#  GLESv2_FOUND - System has GLESv2
-#  GLESv2_INCLUDE_DIRS - The GLESv2 include directories
-#  GLESv2_LIBRARIES - The libraries needed to use GLESv2
-
-find_package(PkgConfig)
-pkg_check_modules(PC_GLESv2 QUIET glesv2)
-
-find_path(GLESv2_INCLUDE_DIR GLES2/gl2.h
-          HINTS ${PC_GLESv2_INCLUDEDIR} ${PC_GLESv2_INCLUDE_DIRS})
-
-find_library(GLESv2_LIBRARY GLESv2
-             HINTS ${PC_GLESv2_LIBDIR} ${PC_GLESv2_LIBRARY_DIRS})
-
-set(GLESv2_LIBRARIES ${GLESv2_LIBRARY})
-set(GLESv2_INCLUDE_DIRS ${GLESv2_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set GLESv2_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(GLESv2  DEFAULT_MSG
-                                  GLESv2_LIBRARY GLESv2_INCLUDE_DIR)
-
-mark_as_advanced(GLESv2_INCLUDE_DIR GLESv2_LIBRARY)

=== removed file 'miral-qt/cmake/modules/FindQt5PlatformSupport.cmake'
--- miral-qt/cmake/modules/FindQt5PlatformSupport.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/FindQt5PlatformSupport.cmake	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-#.rst:
-# FindQt5PlatformSupport
-# -------
-#
-# Try to find Qt5PlatformSupport on a Unix system.
-#
-# This will define the following variables:
-#
-# ``Qt5PlatformSupport_FOUND``
-#     True if (the requested version of) Qt5PlatformSupport is available
-# ``Qt5PlatformSupport_VERSION``
-#     The version of Qt5PlatformSupport
-# ``Qt5PlatformSupport_LIBRARIES``
-#     This can be passed to target_link_libraries() instead of the ``Qt5PlatformSupport::Qt5PlatformSupport``
-#     target
-# ``Qt5PlatformSupport_INCLUDE_DIRS``
-#     This should be passed to target_include_directories() if the target is not
-#     used for linking
-# ``Qt5PlatformSupport_DEFINITIONS``
-#     This should be passed to target_compile_options() if the target is not
-#     used for linking
-#
-# If ``Qt5PlatformSupport_FOUND`` is TRUE, it will also define the following imported target:
-#
-# ``Qt5PlatformSupport::Qt5PlatformSupport``
-#     The Qt5PlatformSupport library
-#
-# In general we recommend using the imported target, as it is easier to use.
-# Bear in mind, however, that if the target is in the link interface of an
-# exported library, it must be made available by the package config file.
-
-#=============================================================================
-# Copyright 2014 Alex Merry <[e-mail]>
-# Copyright 2014 Martin Gräßlin <[e-mail]>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-if(CMAKE_VERSION VERSION_LESS 2.8.12)
-    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5PlatformSupport.cmake")
-endif()
-if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5PlatformSupport.cmake")
-endif()
-
-# Use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-find_package(PkgConfig)
-pkg_check_modules(PKG_Qt5PlatformSupport QUIET Qt5Gui)
-
-set(Qt5PlatformSupport_DEFINITIONS ${PKG_Qt5PlatformSupport_CFLAGS_OTHER})
-set(Qt5PlatformSupport_VERSION ${PKG_Qt5PlatformSupport_VERSION})
-
-find_path(Qt5PlatformSupport_INCLUDE_DIR
-    NAMES
-        QtPlatformSupport/private/qfontconfigdatabase_p.h
-    HINTS
-        ${PKG_Qt5PlatformSupport_INCLUDEDIR}/QtPlatformSupport/${PKG_Qt5PlatformSupport_VERSION}/
-)
-find_library(Qt5PlatformSupport_LIBRARY
-    NAMES
-        Qt5PlatformSupport
-    HINTS
-        ${PKG_Qt5PlatformSupport_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Qt5PlatformSupport
-    FOUND_VAR
-        Qt5PlatformSupport_FOUND
-    REQUIRED_VARS
-        Qt5PlatformSupport_LIBRARY
-        Qt5PlatformSupport_INCLUDE_DIR
-    VERSION_VAR
-        Qt5PlatformSupport_VERSION
-)
-
-if(Qt5PlatformSupport_FOUND AND NOT TARGET Qt5PlatformSupport::Qt5PlatformSupport)
-    add_library(Qt5PlatformSupport::Qt5PlatformSupport UNKNOWN IMPORTED)
-    set_target_properties(Qt5PlatformSupport::Qt5PlatformSupport PROPERTIES
-        IMPORTED_LOCATION "${Qt5PlatformSupport_LIBRARY}"
-        INTERFACE_COMPILE_OPTIONS "${Qt5PlatformSupport_DEFINITIONS}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Qt5PlatformSupport_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(Qt5PlatformSupport_LIBRARY Qt5PlatformSupport_INCLUDE_DIR)
-
-# compatibility variables
-set(Qt5PlatformSupport_LIBRARIES ${Qt5PlatformSupport_LIBRARY})
-set(Qt5PlatformSupport_INCLUDE_DIRS ${Qt5PlatformSupport_INCLUDE_DIR})
-set(Qt5PlatformSupport_VERSION_STRING ${Qt5PlatformSupport_VERSION})
-
-
-include(FeatureSummary)
-set_package_properties(Qt5PlatformSupport PROPERTIES
-    URL "http://www.qt.io"
-    DESCRIPTION "Qt PlatformSupport module."
-)
-

=== removed file 'miral-qt/cmake/modules/QmlPlugins.cmake'
--- miral-qt/cmake/modules/QmlPlugins.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/QmlPlugins.cmake	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-# If you need to override the qmlplugindump binary, create the qmlplugin executable
-# target before loading this plugin.
-
-if(NOT TARGET qmlplugindump)
-    find_program(qmlplugindump_exe qmlplugindump)
-
-    if(NOT qmlplugindump_exe)
-      msg(FATAL_ERROR "Could not locate qmlplugindump.")
-    endif()
-
-    add_executable(qmlplugindump IMPORTED)
-    set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
-endif()
-
-#
-# A custom target for building the qmltypes files manually.
-#
-if (NOT TARGET qmltypes)
-    add_custom_target(qmltypes)
-endif()
-
-# Creates a target for copying resource files into build dir and optionally installing them.
-#
-# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
-# into ${DESTINATION}/${path}.
-#
-# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
-#
-# export_qmlfiles(plugin path
-#     [SEARCH_PATH path]      # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
-#     [BINARY_DIR path]
-#     [DESTINATION path]
-#     [TARGET_PREFIX string]  # Will be prefixed to the target name
-# )
-#
-# Created target:
-#   - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
-
-macro(export_qmlfiles PLUGIN PATH)
-    set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
-    cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
- 
-    if(NOT QMLFILES_SEARCH_PATH)
-        set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-    endif()
-
-    if(QMLFILES_BINARY_DIR)
-        set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
-    else()
-        set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
-    endif()
-
-    file(GLOB QMLFILES
-        ${QMLFILES_SEARCH_PATH}/*.qml
-        ${QMLFILES_SEARCH_PATH}/*.js
-        ${QMLFILES_SEARCH_PATH}/*.jpg
-        ${QMLFILES_SEARCH_PATH}/*.png
-        ${QMLFILES_SEARCH_PATH}/*.sci
-        ${QMLFILES_SEARCH_PATH}/*.svg
-        ${QMLFILES_SEARCH_PATH}/*.qmltypes
-        ${QMLFILES_SEARCH_PATH}/qmldir
-    )
-
-    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
-
-    # copy the files
-    add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
-                        COMMAND cp ${QMLFILES} ${qmlfiles_dir}
-                        DEPENDS ${QMLFILES}
-                        SOURCES ${QMLFILES}
-    )
-
-    if(QMLFILES_DESTINATION)
-        # install the qmlfiles file.
-        install(FILES ${QMLFILES}
-            DESTINATION ${QMLFILES_DESTINATION}/${PATH}
-        )
-    endif()
-endmacro()
-
-
-# Creates a target for generating the typeinfo file for a QML plugin and/or installs the plugin
-# targets.
-#
-# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
-# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's assumed that current source
-# path ends with ${path}.
-#
-# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
-#
-# export_qmlplugin(plugin version path
-#     [BINARY_DIR path]
-#     [DESTINATION path]
-#     [TARGET_PREFIX string]  # Will be prefixed to the target name
-#     [ENVIRONMENT string]    # Will be added to qmlplugindump's env
-#     [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
-#     [NO_TYPES] # Do not create the qmltypes target
-# )
-#
-# Created target:
-#   - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the source dir.
-#     It will be made a dependency of the "qmltypes" target.
-
-macro(export_qmlplugin PLUGIN VERSION PATH)
-    set(options NO_TYPES)
-    set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
-    set(multi TARGETS)
-    cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
-
-    get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
-
-    if(QMLPLUGIN_BINARY_DIR)
-        set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
-    else()
-        # Find import path to point qmlplugindump at
-        string(REGEX REPLACE "/${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-        set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
-    endif()
-
-    if(NOT QMLPLUGIN_NO_TYPES)
-        # Relative path for the module
-        string(REPLACE "${CMAKE_BINARY_DIR}/" "" QMLPLUGIN_MODULE_DIR "${QMLPLUGIN_BINARY_DIR}")
-
-        # Find the last segment of the plugin name to use as qmltypes basename
-        string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
-        set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
-        set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
-
-        add_custom_target(${target_prefix}-qmltypes
-            COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
-                    ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
-                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
-        add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
-        add_dependencies(qmltypes ${target_prefix}-qmltypes)
-    endif()
-
-    set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
-                          ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
-                          LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
-                          RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
-    )
-
-    if (QMLPLUGIN_DESTINATION)
-        # Install additional targets
-        install(TARGETS ${QMLPLUGIN_TARGETS}
-                DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
-        )
-    endif()
-endmacro()

=== removed file 'miral-qt/cmake/modules/QmlTest.cmake'
--- miral-qt/cmake/modules/QmlTest.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/QmlTest.cmake	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-# add_qml_test(path component_name [NO_ADD_TEST] [NO_TARGETS]
-#              [TARGETS target1 [target2 [...]]]
-#              [IMPORT_PATHS import_path1 [import_path2 [...]]
-#              [PROPERTIES prop1 value1 [prop2 value2 [...]]])
-#
-# NO_ADD_TEST will prevent adding the test to the "test" target
-# NO_TARGETS will prevent adding the test to any targets
-# TARGETS lists the targets the test should be added to
-# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
-# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
-#
-# Two targets will be created:
-#   - testComponentName - Runs the test with qmltestrunner
-#   - tryComponentName - Runs the test with uqmlscene, for manual interaction
-#
-# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
-# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
-# qmltest_DEFAULT_TARGETS
-# qmltest_DEFAULT_IMPORT_PATHS
-# qmltest_DEFAULT_PROPERTIES
-
-find_program(qmltestrunner_exe qmltestrunner)
-
-if(NOT qmltestrunner_exe)
-  msg(FATAL_ERROR "Could not locate qmltestrunner.")
-endif()
-
-set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
-
-macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
-    set(options NO_ADD_TEST NO_TARGETS)
-    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
-
-    cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
-
-    set(qmlscene_TARGET try${COMPONENT_NAME})
-    set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
-
-    set(qmlscene_imports "")
-    if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
-        foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
-            list(APPEND qmlscene_imports "-I")
-            list(APPEND qmlscene_imports ${IMPORT_PATH})
-        endforeach(IMPORT_PATH)
-    elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
-        foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
-            list(APPEND qmlscene_imports "-I")
-            list(APPEND qmlscene_imports ${IMPORT_PATH})
-        endforeach(IMPORT_PATH)
-    endif()
-
-    set(qmlscene_command
-        env ${qmltest_ENVIRONMENT}
-        ${qmlscene_exe} ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
-            ${qmlscene_imports}
-    )
-    add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
-
-endmacro(add_manual_qml_test)
-
-macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)
-    add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})
-endmacro(add_qml_benchmark)
-
-macro(add_qml_test SUBPATH COMPONENT_NAME)
-    add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})
-endmacro(add_qml_test)
-
-macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
-    set(options NO_ADD_TEST NO_TARGETS)
-    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
-
-    cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
-
-    set(qmltest_TARGET test${COMPONENT_NAME})
-    set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
-    set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
-
-    set(qmltestrunner_imports "")
-    if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
-        foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
-            list(APPEND qmltestrunner_imports "-import")
-            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
-        endforeach(IMPORT_PATH)
-    elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
-        foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
-            list(APPEND qmltestrunner_imports "-import")
-            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
-        endforeach(IMPORT_PATH)
-    endif()
-
-    string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
-    if(cmake_generator_lower STREQUAL "unix makefiles")
-        set(function_ARGS $(FUNCTION))
-    else()
-        set(function_ARGS "")
-    endif()
-
-    if (${ITERATIONS} GREATER 0)
-        set(ITERATIONS_STRING "-iterations" ${ITERATIONS})
-    else()
-        set(ITERATIONS_STRING "")
-    endif()
-
-    set(qmltest_command
-        env ${qmltest_ENVIRONMENT}
-        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
-            ${qmltestrunner_imports}
-            ${ITERATIONS_STRING}
-            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
-            -o -,txt
-            ${function_ARGS}
-    )
-    find_program( HAVE_GCC gcc )
-    if (NOT ${HAVE_GCC} STREQUAL "")
-        exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
-        set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
-    endif()
-    set(qmltest_xvfb_command
-        env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
-        xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
-        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
-        ${qmltestrunner_imports}
-            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
-            -o -,txt
-            ${function_ARGS}
-    )
-
-    add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
-    add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
-    add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
-endmacro(add_qml_test_internal)
-
-macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
-    set(testCommand
-          LD_LIBRARY_PATH=${LD_PATH}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
-          -o ${CMAKE_BINARY_DIR}/${CLASSNAME}Test.xml,xunitxml
-          -o -,txt)
-
-    add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
-    add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
-
-    find_program( HAVE_GCC gcc )
-    if (NOT ${HAVE_GCC} STREQUAL "")
-        exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
-        set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
-    endif()
-    set(xvfbtestCommand
-          ${LD_PRELOAD_PATH}
-          LD_LIBRARY_PATH=${LD_PATH}
-          xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
-          ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
-          -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
-          -o -,txt)
-
-    add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
-    add_dependencies(qmluitests xvfbtest${CLASS_NAME})
-endmacro(add_binary_qml_test)
-
-macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
-    add_custom_target(${qmltest_TARGET} ${qmltest_command})
-
-    if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
-        set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
-    elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
-        set_target_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
-    endif()
-
-    if("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
-        add_test(${qmltest_TARGET} ${qmltest_command})
-
-        if(NOT "${qmltest_UNPARSED_ARGUMENTS}" STREQUAL "")
-            set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_PROPERTIES})
-        elseif(NOT "${qmltest_DEFAULT_PROPERTIES}" STREQUAL "")
-            set_tests_properties(${qmltest_TARGET} PROPERTIES ${qmltest_DEFAULT_PROPERTIES})
-        endif()
-    endif("${qmltest_NO_ADD_TEST}" STREQUAL FALSE AND NOT "${qmltest_DEFAULT_NO_ADD_TEST}" STREQUAL "TRUE")
-
-    if("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
-        if(NOT "${qmltest_TARGETS}" STREQUAL "")
-            foreach(TARGET ${qmltest_TARGETS})
-                add_dependencies(${TARGET} ${qmltest_TARGET})
-            endforeach(TARGET)
-        elseif(NOT "${qmltest_DEFAULT_TARGETS}" STREQUAL "")
-            foreach(TARGET ${qmltest_DEFAULT_TARGETS})
-                add_dependencies(${TARGET} ${qmltest_TARGET})
-            endforeach(TARGET)
-        endif()
-    endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
-
-endmacro(add_qmltest_target)

=== removed file 'miral-qt/cmake/modules/UseLttngGenTp.cmake'
--- miral-qt/cmake/modules/UseLttngGenTp.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/UseLttngGenTp.cmake	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-if(POLICY CMP0011)
- cmake_policy(SET CMP0011 NEW)
-endif(POLICY CMP0011)
-
-find_program(LTTNG_GEN_TP NAMES lttng-gen-tp DOC "lttng-gen-tp executable")
-if(NOT LTTNG_GEN_TP)
- message(FATAL_ERROR "Excutable lttng-gen-top not found")
-endif()
-
-function(add_lttng_gen_tp)
- set(_one_value NAME)
- cmake_parse_arguments (arg "" "${_one_value}" "" ${ARGN})
-
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
- COMMAND "${LTTNG_GEN_TP}"
- -o "${arg_NAME}.h"
- -o "${arg_NAME}.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/${arg_NAME}.tp"
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS "${arg_NAME}.tp"
- )
-endfunction(add_lttng_gen_tp)
\ No newline at end of file

=== removed file 'miral-qt/cmake/modules/autopilot.cmake'
--- miral-qt/cmake/modules/autopilot.cmake	2016-06-01 22:06:51 +0000
+++ miral-qt/cmake/modules/autopilot.cmake	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-add_custom_target(autopilot)
-
-function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
-    add_custom_target(autopilot-${TEST_NAME}
-        COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${QTMIR_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
-        WORKING_DIRECTORY ${WORKING_DIR}
-        DEPENDS fake_install
-    )
-
-    add_custom_target(fake_install
-        COMMAND cmake --build ${CMAKE_BINARY_DIR} --target install
-    )
-
-    add_dependencies(autopilot autopilot-${TEST_NAME})
-
-    add_custom_target(autopilot2-${TEST_NAME}
-        COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${QTMIR_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
-        WORKING_DIRECTORY ${WORKING_DIR}
-        DEPENDS fake_install
-    )
-
-    add_dependencies(autopilot autopilot2-${TEST_NAME})
-
-endfunction()

=== removed directory 'miral-qt/debian'
=== removed file 'miral-qt/debian/bileto_convert_to_gles'
--- miral-qt/debian/bileto_convert_to_gles	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/bileto_convert_to_gles	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# This script converts the debian/ packaging into an alternate source package
-# which builds with GLES. You should copy the source tree into a new directory
-# before running this script (so you have one copy for GLES and one copy for
-# regular GL).
-
-set -eu
-
-# Steps to start a new quilt patch:
-#     quilt new convert-to-gles.patch
-#     quilt add debian/*
-#     # apply changes
-
-# Steps to refresh this quilt patch when nongles changes:
-#     quilt push -af
-#     # fix up
-
-# When finished, save quilt patch with:
-#     quilt refresh
-#     quilt pop -a
-
-export QUILT_PATCHES=debian/gles-patches
-quilt push -a
-
-sed --in-place 's/^qtmir /qtmir-gles /g' debian/changelog
-
-rm --recursive --force ./.pc/

=== removed file 'miral-qt/debian/changelog'
--- miral-qt/debian/changelog	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,1275 +0,0 @@
-qtmir (0.4.8+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium
-
-  [ Alan Griffiths ]
-  * Reduce coupling to MirServer - it has  been misused as a context
-    object.
-
-  [ Daniel d'Andrada ]
-  * Also interpret the cursor names used by Mir client API (LP:
-    #1447839)
-  * Application: Don't respawn if closed while still starting up (LP:
-    #1575577)
-
-  [ Daniel d'Andrada, Michał Sawicz ]
-  * Centralize logging categories
-
-  [ Gerry Boland ]
-  * UAL can throw on creating Application if invalid appId, catch
-    instead of aborting (LP: #1578258)
-
-  [ Timo Jyrinki ]
-  * Use FindQt5PlatformSupport to find platform support, other methods
-    not available on Qt 5.6 anymore. (LP: #1554404)
-
- -- Michał Sawicz <[e-mail]>  Fri, 20 May 2016 08:41:51 +0000
-
-qtmir (0.4.8+16.04.20160518.1-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Fix ProxySurfaceListModel::countChanged signal
-
-  [ Daniel d'Andrada, Michał Sawicz ]
-  * Move prompt surfaces from MirSurface to Application and emit
-    firstChanged signal
-
- -- Nick Dedekind <[e-mail]>  Wed, 18 May 2016 11:18:33 +0000
-
-qtmir (0.4.8+16.04.20160511-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Session: Add a blank surface to the public list if it already has
-    child prompt surfaces (LP: #1578665)
-
- -- Michał Sawicz <[e-mail]>  Wed, 11 May 2016 09:08:29 +0000
-
-qtmir (0.4.8+16.04.20160429.1-0ubuntu1) xenial; urgency=medium
-
-  [ Gerry Boland, Michał Sawicz, Nick Dedekind ]
-  * Enhance ScreenController & the DisplayConfigurationPolicy to
-    implement dynamic grid units. (LP: #1573532)
-
- -- Michał Sawicz <[e-mail]>  Fri, 29 Apr 2016 20:04:55 +0000
-
-qtmir (0.4.8+16.04.20160428-0ubuntu1) xenial; urgency=medium
-
-  [ Lukáš Tinkl ]
-  * Regression fix: restore window title handling (LP: #1563522)
-
-  [ Michael Terry ]
-  * Use latest UbuntuAppLaunch API which supports libertine apps.
-
- -- Michael Terry <[e-mail]>  Thu, 28 Apr 2016 12:48:51 +0000
-
-qtmir (0.4.8+16.04.20160426-0ubuntu1) xenial; urgency=medium
-
-  * Mir 0.22 compatibility
-
- -- Alberto Aguirre <[e-mail]>  Tue, 26 Apr 2016 07:20:39 +0000
-
-qtmir (0.4.8+16.04.20160413-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Application: improve debug logging
-  * Logging of Qt's OpenGL debug messages now must be enabled via CMake
-    option
-  * MirSurface: replace keymapLayout and keymapVariant with keymap
-  * Remove application screenshot provider
-  * Surface-based window management
-
-  [ Michał Sawicz, Robert Bruce Park ]
-  * Inline -gles packaging.
-
- -- Gerry Boland <[e-mail]>  Wed, 13 Apr 2016 18:38:59 +0000
-
-qtmir (0.4.8+16.04.20160330-0ubuntu1) xenial; urgency=medium
-
-  * Drop leftover Xs-Testsuite header
-
- -- Michał Sawicz <[e-mail]>  Wed, 30 Mar 2016 22:53:20 +0000
-
-qtmir (0.4.8+16.04.20160329.1-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel van Vugt ]
-  * Don't use preferred_mode_index. Some devices like TVs don't provide
-    a preferred mode, so preferred_mode_index may be out of range (a
-    clumsy way to represent 'none'). Instead use the resolution of the
-    current display mode, which should always be in range. (LP:
-    #1560497)
-
- -- Michał Sawicz <[e-mail]>  Tue, 29 Mar 2016 19:24:13 +0000
-
-qtmir (0.4.8+16.04.20160322.1-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * Added Application::setStage
-
-  [ Lukáš Tinkl, Michał Sawicz ]
-  * Support for switching keyboard layouts (LP: #1524400, #1491340)
-
-  [ Lukáš Tinkl, Michał Sawicz, Nick Dedekind ]
-  * Add support for low shell chrome. (LP: #1535397)
-
- -- Michael Zanetti <[e-mail]>  Tue, 22 Mar 2016 16:18:06 +0000
-
-qtmir (0.4.7+16.04.20160310.1-0ubuntu1) xenial; urgency=medium
-
-  [ Alan Griffiths ]
-  * Copy the Window Management work-in-progress from Mir examples.
-
-  [ Alberto Aguirre ]
-  * Hook MirOpenGLContext::doneCurrent to Screen::doneCurrent
-
-  [ Daniel d'Andrada ]
-  * Ensure QmlEngine doesn't delete our MirSurfaces
-
-  [ Gerry Boland ]
-  * Allow Mir remove command line arguments it understands, before
-    letting Qt process them.
-  * Ensure ScreenWindow geometry correctly set and used after moving
-    Screen (LP: #1545286)
-  * Screen: only enable orientation sensor for internal display. (LP:
-    #1545286)
-
-  [ Michael Terry ]
-  * Fix some mocks to use more realistic code paths.
-
-  [ Michael Zanetti ]
-  * Add a dedicated property for the inputMethodSurface (LP: #1545286)
-
-  [ Michał Sawicz ]
-  * Drop dummy autopkgtest
-
- -- Michał Sawicz <[e-mail]>  Thu, 10 Mar 2016 09:29:49 +0000
-
-qtmir (0.4.7+16.04.20160219-0ubuntu1) xenial; urgency=medium
-
-  * Mir 0.20 Release
-
- -- Alan Griffiths <[e-mail]>  Fri, 19 Feb 2016 10:41:19 +0000
-
-qtmir (0.4.7+16.04.20160212-0ubuntu1) xenial; urgency=medium
-
-  [ Albert Astals Cid ]
-  * Provide branch prediction information to the if in compressTimestamp
-  * Reset start time if the timestamp travels to the past (LP: #1524488)
-
-  [ Daniel d'Andrada ]
-  * Let shell decide the initial surface size (LP: #1532974)
-  * Remove the useless TaskController
-  * Surface Size Hints
-  * Update mir version requirement
-
-  [ Michał Sawicz ]
-  * Bump unity-api dependencies
-  * Use QStandardPaths to determine QML cache location
-
-  [ Nick Dedekind ]
-  * Moved test framework into a static library for quicker
-    recompilation.
-
- -- Michał Sawicz <[e-mail]>  Fri, 12 Feb 2016 00:07:26 +0000
-
-qtmir (0.4.7+16.04.20160208-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * Added fix and test for closing app during the StoppedResumable
-    state. (LP: #1541388)
-
- -- Michał Sawicz <[e-mail]>  Mon, 08 Feb 2016 09:36:17 +0000
-
-qtmir (0.4.7+16.04.20160127.1-0ubuntu1) xenial; urgency=medium
-
-  * Changes for mir 0.19.
-
- -- Brandon Schaefer <[e-mail]>  Wed, 27 Jan 2016 21:42:31 +0000
-
-qtmir (0.4.7+16.04.20160122-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * Fixed issue where stopping the session while suspending was causing
-    app close to stall. (LP: #1536133)
-
- -- Michał Sawicz <[e-mail]>  Fri, 22 Jan 2016 16:54:39 +0000
-
-qtmir (0.4.7+16.04.20160104-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Update Session.fullscreen properties at the right time (LP:
-    #1525893)
-
- -- Michał Sawicz <[e-mail]>  Mon, 04 Jan 2016 09:38:12 +0000
-
-qtmir (0.4.7+16.04.20151222-0ubuntu1) xenial; urgency=medium
-
-  * No-change rebuild to get -gles in sync
-
- -- Michał Sawicz <[e-mail]>  Tue, 22 Dec 2015 15:29:49 +0000
-
-qtmir (0.4.7+16.04.20151217-0ubuntu1) xenial; urgency=medium
-
-  [ Andreas Pokorny ]
-  * compatibility branch for Mir 0.18
-
-  [ Cemil Azizoglu ]
-  * compatibility branch for Mir 0.18
-
-  [ Kevin DuBois ]
-  * compatibility branch for Mir 0.18
-
- -- Kevin DuBois <[e-mail]>  Thu, 17 Dec 2015 12:01:56 +0000
-
-qtmir (0.4.7+16.04.20151210-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * [ Nick Dedekind ]
-  * Request app closing rather than killing.
-
-  [ Daniel d'Andrada ]
-  * Add MirSurfaceItem.fillMode and ensure items and buffer are in sync
-  * Make Session hold multiple surfaces
-
-  [ Michael Terry ]
-  * Don't hold a wakelock on apps that are exempt from lifecycle
-    management. (LP: #1518764)
-
-  [ Michał Sawicz ]
-  * Add MirSurfaceItem.fillMode and ensure items and buffer are in sync
-  * Don't hold a wakelock on apps that are exempt from lifecycle
-    management. (LP: #1518764)
-
- -- Gerry Boland <[e-mail]>  Thu, 10 Dec 2015 13:08:47 +0000
-
-qtmir (0.4.6+16.04.20151125-0ubuntu2) xenial; urgency=medium
-
-  * Rebuild against Qt 5.5.1.
-
- -- Timo Jyrinki <[e-mail]>  Mon, 30 Nov 2015 16:16:06 +0200
-
-qtmir (0.4.6+16.04.20151125-0ubuntu1) xenial; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Forward Mir mouse wheel events to the shell cursor (LP: #1497091)
-  * Implemented support for cursors set by client surfaces
-  * Revert revision 415
-
-  [ Gerry Boland ]
-  * Manage frameSwapped signal/slot connection with MirSurface more
-    strictly to avoid crash. (LP: #1517571)
-
- -- Michał Sawicz <[e-mail]>  Wed, 25 Nov 2015 15:38:57 +0000
-
-qtmir (0.4.6+16.04.20151119-0ubuntu1) xenial; urgency=medium
-
-  [ Albert Astals Cid ]
-  * Build with clang (tests/gmock fails and is unfixable on our side i'd
-    say)
-  * Enable Efficient String Construction by default
-
-  [ Gerry Boland ]
-  * Fix use of uninitialized variable
-  * Use pid_t for PIDs.
-
-  [ Loïc Molinari ]
-  * Ensured Mir surface items with size less than or equal to zero are
-    not rendered, as it's usually done for standard QtQuick items.
-
-  [ Michał Sawicz ]
-  * Build with clang (tests/gmock fails and is unfixable on our side i'd
-    say)
-
-  [ Nick Dedekind ]
-  * Fix a crash when dropping a surface frame before Qt draws a surface
-    item. (LP: #1517139)
-
- -- Gerry Boland <[e-mail]>  Thu, 19 Nov 2015 12:56:17 +0000
-
-qtmir (0.4.6+16.04.20151113-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * Update surface textures when dropping frames. (LP: #1515356)
-
- -- Gerry Boland <[e-mail]>  Fri, 13 Nov 2015 16:42:38 +0000
-
-qtmir (0.4.6+16.04.20151112-0ubuntu1) xenial; urgency=medium
-
-  * Fix armhf builds on Xenial by using -std=gnu99 instead of c99
-
- -- Gerry Boland <[e-mail]>  Thu, 12 Nov 2015 16:26:27 +0000
-
-qtmir (0.4.6+16.04.20151110-0ubuntu1) xenial; urgency=medium
-
-  [ Nick Dedekind ]
-  * Reverted occlusion detection (lp#1514556) (LP: #1514556)
-
- -- Gerry Boland <[e-mail]>  Tue, 10 Nov 2015 09:19:59 +0000
-
-qtmir (0.4.6+16.04.20151102-0ubuntu1) xenial; urgency=medium
-
-  [ Alan Griffiths ]
-  * Test harness for MirWindowManager (in preparation for more
-    intelligent window management)
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Michael Terry ]
-  * Support new isTouchApp property to ApplicationInfoInterface and move
-    lifecycle policy logic out of qtmir.
-
-  [ Michał Sawicz ]
-  * Clean up packaging and fix autopkgtest on armhf
-
-  [ Nick Dedekind ]
-  * Hand Qt millisecond timestamps rather than nanosecond. (LP:
-    #1510571, #1511076, #1511711)
-  * Support server->client visibility change to stop rendering
-    (lp:#1475678) (LP: #1475678)
-
- -- Michał Sawicz <[e-mail]>  Mon, 02 Nov 2015 11:22:29 +0000
-
-qtmir (0.4.6+15.10.20151021-0ubuntu1) wily; urgency=medium
-
-  [ Alan Griffiths ]
-  * Opaquify MirWindowManager to control visibility of upcoming Window
-    Management work
-
-  [ Albert Astals Cid ]
-  * Don't search for the element again
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Daniel d'Andrada ]
-  * Improve multimonitor support
-  * MirSurfaceItem: Survive holding a surface with an empty texture
-  * Shell draws its own cursor using the new Cursor QML element
-
-  [ Gerry Boland ]
-  * Initial multimonitor support - react correctly to Mir
-    DisplayConfiguration changes. (LP: #1488831, #1488863, #1436735)
-  * Workaround for AutoPilot input coordinate positioning being outside
-    screen geometry
-
-  [ Lukáš Tinkl ]
-  * Implement support for mouse wheel events; correctly pass around
-    buttons (LP: #1497091)
-  * React to surface modifications (window caption)
-
-  [ Michał Sawicz ]
-  * Improve multimonitor support
-  * MirSurfaceItem: Survive holding a surface with an empty texture
-  * React to surface modifications (window caption)
-
-  [ Nick Dedekind ]
-  * Added touch performance tracing and test.
-  * Removed the manipulation of the CMAKE_INSTALL_PREFIX from
-    debian/rules
-
- -- Michał Sawicz <[e-mail]>  Wed, 21 Oct 2015 11:47:16 +0000
-
-qtmir (0.4.6+15.10.20151008.2-0ubuntu1) wily; urgency=medium
-
-  [ Alexandros Frantzis ]
-  * Update for Mir 0.17 changes
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- Alexandros Frantzis <[e-mail]>  Thu, 08 Oct 2015 17:56:00 +0000
-
-qtmir (0.4.6+15.10.20150930.1-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Daniel d'Andrada ]
-  * MirSurfaceItem: texture must be manipulated only from the scene
-    graph thread (LP: #1499388, #1495871)
-
-  [ Gerry Boland ]
-  * Add "Closing" state to Application, use it to distinguish user-
-    induced close from app-induced close. Don't clear QML cache if user-
-    induced. (LP: #1500372)
-
- -- Michał Sawicz <[e-mail]>  Wed, 30 Sep 2015 10:08:37 +0000
-
-qtmir (0.4.6+15.10.20150925-0ubuntu1) wily; urgency=medium
-
-  * Bump application API version
-
- -- Michał Sawicz <[e-mail]>  Fri, 25 Sep 2015 12:11:11 +0000
-
-qtmir (0.4.6+15.10.20150923-0ubuntu1) wily; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Cemil Azizoglu ]
-  * Port gl_bind_to_texture to the new TextureSource interface. Update
-    for Mir 0.16 release.
-
- -- Cemil Azizoglu <[e-mail]>  Wed, 23 Sep 2015 15:17:13 +0000
-
-qtmir (0.4.6+15.10.20150918-0ubuntu1) wily; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Update surface focus when a surface enters or leaves a
-    MirSurfaceItem (LP: #1491034, #1495437)
-
- -- Michał Sawicz <[e-mail]>  Fri, 18 Sep 2015 20:11:52 +0000
-
-qtmir (0.4.6+15.10.20150914-0ubuntu1) wily; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * MirSurfaceItem gets dirty when it's set to draw a different (or no)
-    surface (LP: #1492185)
-  * QtEventFeeder: log the pointer events it gets from Mir
-
-  [ Daniel van Vugt ]
-  * Stop waking up every 200ms if there's nothing to wake up for. It's
-    just wasting battery. (LP: #1479250)
-
- -- Gerry Boland <[e-mail]>  Mon, 14 Sep 2015 13:11:56 +0000
-
-qtmir (0.4.6+15.10.20150904-0ubuntu1) wily; urgency=medium
-
-  [ Michal Sawicz ]
-  * No change rebuild to resync vivid+overlay and wily
-
-  [ CI Train Bot ]
-  * No-change rebuild.
-
- -- CI Train Bot <[e-mail]>  Fri, 04 Sep 2015 10:40:35 +0000
-
-qtmir (0.4.6+15.04.20150827.1-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Enable multiple MirSurfaceItems rendering the same MirSurface
-  * Allow resizing an app that is in the process of getting suspended.
-    (LP: #1466510)
-
- -- CI Train Bot <[e-mail]>  Thu, 27 Aug 2015 13:58:54 +0000
-
-qtmir (0.4.5+15.10.20150817-0ubuntu1) wily; urgency=medium
-
-  * 
-
- -- CI Train Bot <[e-mail]>  Mon, 17 Aug 2015 19:28:26 +0000
-
-qtmir (0.4.5+15.10.20150812.1-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel van Vugt ]
-  * MirSurfaceItem: Remove an unnecessary and potentially infinite loop
-    (LP: #1477430) (LP: #1477430)
-
-  [ Gerry Boland ]
-  * Standardize licences to LGPLv3, update years, remove authors (LP:
-    #1483664)
-  * authorizeSession incorrectly edits desktopFilePath supplied by
-    desktop_file_hint (LP: #1483225)
-
- -- CI Train Bot <[e-mail]>  Wed, 12 Aug 2015 11:36:06 +0000
-
-qtmir (0.4.5+15.10.20150804.1-0ubuntu1) vivid; urgency=medium
-
-  * Dual release with wily
-
- -- Gerry Boland <[e-mail]>  Tue, 04 Aug 2015 17:21:12 +0000
-
-qtmir (0.4.5+15.04.20150821-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Improve handling of applications that are stopping or getting killed
-    (LP: #1483840, #1485608)
-
-  [ Gerry Boland ]
-  * AppMan: if app destroys surface while in Running state, it is
-    probably shutting down, so preempt it by removing it from the model
-
- -- CI Train Bot <[e-mail]>  Fri, 21 Aug 2015 11:40:14 +0000
-
-qtmir (0.4.5+15.04.20150820-0ubuntu1) vivid; urgency=medium
-
-  [ Gerry Boland ]
-  * Hotfix to work around bug 1483752 (LP: #1483752)
-
-  [ Michael Zanetti ]
-  * Hotfix to work around bug 1483752 (LP: #1483752)
-
- -- CI Train Bot <[e-mail]>  Thu, 20 Aug 2015 12:59:54 +0000
-
-qtmir (0.4.5+15.10.20150804.1-0ubuntu1) wily; urgency=medium
-
-  [ Alan Griffiths ]
-  * Start restructuring code to use the Mir WindowManager interface for
-    window management. (Instead of completely replacing the Shell.)
-
-  [ Andreas Pokorny ]
-  * ensure the argv passed to mir is a null terminated list (not a
-    nullptr)
-
-  [ Daniel d'Andrada ]
-  * Remove focus-based app lifecycle. Let shell control it.
-  * Remove focus-based app lifecycle. Let shell control it.
-
-  [ Daniel van Vugt ]
-  * ensure the argv passed to mir is a null terminated list (not a
-    nullptr)
-
-  [ Gerry Boland ]
-  * CMake should require mir 0.14
-  * Ubuntu Touch has no shared graphics cache implemented, QPA should
-    not say it does
-  * We depend on Qt 5.4, remove compatibility code for older versions
-
-  [ Lukáš Tinkl ]
-  * Extend the key table to cover full xkb range of keycodes.
-
- -- CI Train Bot <[e-mail]>  Tue, 04 Aug 2015 17:21:12 +0000
-
-qtmir (0.4.5+15.10.20150728-0ubuntu2~gcc5.1) wily; urgency=medium
-
-  * No change rebuild using GCC 5.
-
- -- Matthias Klose <[e-mail]>  Wed, 29 Jul 2015 15:04:01 +0200
-
-qtmir (0.4.5+15.10.20150728-0ubuntu1) wily; urgency=medium
-
-  [ Gerry Boland ]
-  * Remove explicit gcc4.9 dependency (LP: #1452338)
-
- -- CI Train Bot <[e-mail]>  Tue, 28 Jul 2015 09:57:00 +0000
-
-qtmir (0.4.5+15.10.20150722-0ubuntu1) wily; urgency=medium
-
-  [ Andreas Pokorny ]
-  * Release in step with Mir 0.14.0
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- CI Train Bot <[e-mail]>  Wed, 22 Jul 2015 13:01:05 +0000
-
-qtmir (0.4.5+15.10.20150617-0ubuntu1) wily; urgency=medium
-
-  [ Gerry Boland ]
-  * [qpa] refactor QMirServer to clean up its API, and fix strange
-    thread design.
-
-  [ Michał Sawicz ]
-  * Depend on same-version qtmir-{desktop,android}
-
- -- CI Train Bot <[e-mail]>  Wed, 17 Jun 2015 13:46:09 +0000
-
-qtmir (0.4.5+15.10.20150611-0ubuntu2) wily; urgency=medium
-
-  * No-change rebuild against Qt 5.4.2.
-
- -- Timo Jyrinki <[e-mail]>  Mon, 15 Jun 2015 12:31:38 +0300
-
-qtmir (0.4.5+15.10.20150611-0ubuntu1) wily; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Add X-Ubuntu-Supported-Orientations desktop file entry
-
- -- CI Train Bot <[e-mail]>  Thu, 11 Jun 2015 09:10:38 +0000
-
-qtmir (0.4.4+15.04.20150513-0ubuntu1) vivid; urgency=medium
-
-  [ Alan Griffiths ]
-  * Release in step with Mir 0.13.0
-
-  [ Daniel van Vugt ]
-  * Release in step with Mir 0.13.0
-
-  [ Gerry Boland ]
-  * Release in step with Mir 0.13.0
-
- -- CI Train Bot <[e-mail]>  Wed, 13 May 2015 09:44:12 +0000
-
-qtmir (0.4.4+15.04.20150511.1-0ubuntu1) vivid; urgency=medium
-
-  [ Albert Astals Cid ]
-  * Fix debug line
-
-  [ Daniel d'Andrada ]
-  * When synthesizing touch releases for absent touches, send them in
-    separate events (LP: #1437357)
-
-  [ Gerry Boland ]
-  * If Mir fails to start, exit the process immediately as nothing else
-    can be done
-  * Remove boost dependence, it supplies almost nothing of benefit to
-    offset its cost
-  * Remove legacy surface configuration change code, use newer
-    SurfaceObserver
-  * Remove useless profiling information, fixes build with Qt5.5 (LP:
-    #1437181)
-
-  [ Michael Zanetti ]
-  * read exception list from gsettings instead of a hardcoded list
-
-  [ Michał Sawicz ]
-  * Require an application API version, fix the provided version and use
-    include dir from the .pc file
-
- -- CI Train Bot <[e-mail]>  Mon, 11 May 2015 13:16:33 +0000
-
-qtmir (0.4.4+15.04.20150318-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Port to the new MirEvent API and add support for pointer events.
-    (LP: #1417650, #1392716)
-
-  [ Gerry Boland ]
-  * Refactor wakelock handling. Lifecycle exempt apps now release
-    wakelock when shell tries to suspend them (LP: #1423787)
-
-  [ Robert Carr ]
-  * Port to the new MirEvent API and add support for pointer events.
-    (LP: #1417650, #1392716)
-
- -- CI Train Bot <[e-mail]>  Wed, 18 Mar 2015 10:12:22 +0000
-
-qtmir (0.4.4+15.04.20150317-0ubuntu1) vivid; urgency=medium
-
-  [ Albert Astals Cid ]
-  * Make the test pass with Qt >= 5.4.1 (LP: #1427529)
-
- -- CI Train Bot <[e-mail]>  Tue, 17 Mar 2015 18:01:53 +0000
-
-qtmir (0.4.4+15.04.20150227.1-0ubuntu1) vivid; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Kevin DuBois ]
-  * No change rebuild for mir 0.12
-
- -- CI Train Bot <[e-mail]>  Fri, 27 Feb 2015 18:53:32 +0000
-
-qtmir (0.4.4+15.04.20150220-0ubuntu1) vivid; urgency=medium
-
-  [ Albert Astals Cid ]
-  * Don't start timer from the thread it doesn't belong to
-
- -- CI Train Bot <[e-mail]>  Fri, 20 Feb 2015 10:33:30 +0000
-
-qtmir (0.4.4+15.04.20150209-0ubuntu2) vivid; urgency=medium
-
-  * No-change rebuild against Qt 5.4.0.
-
- -- Timo Jyrinki <[e-mail]>  Fri, 13 Feb 2015 13:05:26 +0200
-
-qtmir (0.4.4+15.04.20150209-0ubuntu1) vivid; urgency=medium
-
-  [ Daniel van Vugt ]
-  * QtMir changes required to support the Mir branch of the same name.
-    Landing soon. (LP: #1395581)
-
-  [ Alan Griffiths ]
-  * Port to the msh::Shell API in Mir
-
-  [ Robert Carr ]
-  * Bump build-dep to mir 0.11.
-
- -- Ubuntu daily release <[e-mail]>  Mon, 09 Feb 2015 16:29:08 +0000
-
-qtmir (0.4.4+15.04.20150206-0ubuntu1) vivid; urgency=medium
-
-  [ Gerry Boland ]
-  * Explicitly setting GL-mode breaks GTK app rendering. Removing the
-    hack appears to just work (LP: #1401968)
-
-  [ Michał Sawicz ]
-  * Add moot autopkgtest to run the standard unit tests
-
-  [ Albert Astals Cid ]
-  * Fix demo shell import name
-
-  [ Daniel d'Andrada ]
-  * Don't suspend&resume the main stage app when switching focus from
-    side to main stage
-
- -- Ubuntu daily release <[e-mail]>  Fri, 06 Feb 2015 10:23:19 +0000
-
-qtmir (0.4.4+15.04.20150115-0ubuntu1) vivid; urgency=low
-
-  [ Gerry Boland ]
-  * Add Wakelock support - ensures device drops to deep-sleep mode only
-    when all AppMan suspend tasks have completed
-
-  [ Ricardo Mendoza ]
-  * Reduce suspend timeout to half of the previous value because the
-    long value was too apparent on fast paced apps, like web games of
-    music players; it broke the user experience according to design.
-    (LP: #1402650)
-
- -- Ubuntu daily release <[e-mail]>  Thu, 15 Jan 2015 15:19:46 +0000
-
-qtmir (0.4.4+15.04.20150114-0ubuntu1) vivid; urgency=low
-
-  [ Gerry Boland ]
-  * Depend on :native version of g++ to allow cross-compiling to work.
-    (LP: #1353855)
-
-  [ Michał Sawicz ]
-  * Declare the QByteArray in callDispatcher so it doesn't get deleted
-    before it's copied. (LP: #1408819)
-
-  [ Josh Arenson ]
-  * Assign touch events area to the correct values.
-
-  [ Albert Astals ]
-  * Move the creation of the surface observer to
-    SessionListener::surface_created
-
- -- Ubuntu daily release <[e-mail]>  Wed, 14 Jan 2015 09:07:53 +0000
-
-qtmir (0.4.4+15.04.20150109-0ubuntu1) vivid; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Nick Dedekind ]
-  * Notify prompt sessions that sessions have been suspended/resumed.
-    (LP: #1355173, #1384950)
-
- -- Ubuntu daily release <[e-mail]>  Fri, 09 Jan 2015 17:26:00 +0000
-
-qtmir (0.4.4+15.04.20150108.1-0ubuntu1) vivid; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Cemil Azizoglu ]
-  * Rebuild for Mir 0.10.
-
-  [ Nick Dedekind ]
-  * Compatibility for Mir 0.10.0
-
- -- Ubuntu daily release <[e-mail]>  Thu, 08 Jan 2015 14:18:06 +0000
-
-qtmir (0.4.4+15.04.20141215-0ubuntu1) vivid; urgency=low
-
-  [ Daniel d'Andrada ]
-  * Update README and readd option to disable building tests
-
-  [ Gerry Boland ]
-  * Emit SIGSTOP when AppMan fully initialized, when Mir is ready is too
-    soon (LP: #1394208)
-
- -- Ubuntu daily release <[e-mail]>  Mon, 15 Dec 2014 08:27:44 +0000
-
-qtmir (0.4.4+15.04.20141211-0ubuntu1) vivid; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Alan Griffiths ]
-  * Migration of qtmir from the legacy Mir API
-  * Refactor to better reflect the code structure following new-migrate-
-    to-mir-Server-API
-
- -- Ubuntu daily release <[e-mail]>  Thu, 11 Dec 2014 16:55:53 +0000
-
-qtmir (0.4.4+15.04.20141205-0ubuntu1) vivid; urgency=low
-
-  [ CI Train Bot ]
-  * Resync trunk
-  * Resync trunk
-  * Resync trunk
-  * Resync trunk
-  * Resync trunk
-
-  [ Ricardo Salveti de Araujo ]
-  * qteventfeeder: adding bt and wired headset multimedia keys (LP:
-    #1398427)
-
- -- Ubuntu daily release <[e-mail]>  Fri, 05 Dec 2014 11:04:29 +0000
-
-qtmir (0.4.4+15.04.20141203-0ubuntu1) vivid; urgency=low
-
-  [ Gerry Boland ]
-  * Port qmake->cmake to enable sbuild usage for crosscompiling.
-  * Fix build with Qt5.4 (LP: #1394884)
-
-  [ Michał Sawicz ]
-  * Port qmake->cmake to enable sbuild usage for crosscompiling.
-
-  [ Robert Carr ]
-  * Port qmake->cmake to enable sbuild usage for crosscompiling.
-
-  [ Alberto Aguirre ]
-  * Select mirclient backend for platform-api instead of mirserver.
-
- -- Ubuntu daily release <[e-mail]>  Wed, 03 Dec 2014 10:07:12 +0000
-
-qtmir (0.4.4+15.04.20141124-0ubuntu1) vivid; urgency=low
-
-  [ Alberto Aguirre ]
-  * No-change rebuild againts mir 0.9.0
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
- -- Ubuntu daily release <[e-mail]>  Mon, 24 Nov 2014 23:07:01 +0000
-
-qtmir (0.4.4+15.04.20141110-0ubuntu2) vivid; urgency=medium
-
-  * No-change rebuild against Qt 5.3.2.
-
- -- Timo Jyrinki <[e-mail]>  Mon, 10 Nov 2014 16:50:43 +0200
-
-qtmir (0.4.4+15.04.20141110-0ubuntu1) vivid; urgency=low
-
-  [ Michael Zanetti ]
-  * Use QSGDefaultImageNode instead of QSGSimpleTexture to gain surface
-    manipulation features such as antialiasing (LP: #1351559)
-
-  [ josharenson ]
-  * Add support for enabling/disabling orientation sensor based on
-    screen power state. (LP: #1375297)
-
- -- Ubuntu daily release <[e-mail]>  Mon, 10 Nov 2014 09:41:58 +0000
-
-qtmir (0.4.4+15.04.20141030.2-0ubuntu1) vivid; urgency=low
-
-  [ Ted Gould ]
-  * Use UAL pause/resume functions for stopping/continuing all tasks in
-    the cgroup (LP: #1379786)
-
-  [ Timo Jyrinki ]
-  * Add libmtdev-dev build dependency (LP: #1379152) (LP: #1379152)
-
- -- Ubuntu daily release <[e-mail]>  Thu, 30 Oct 2014 21:48:30 +0000
-
-qtmir (0.4.4+15.04.20141030.1-0ubuntu1) vivid; urgency=low
-
-  [ Ricardo Mendoza ]
-  * Clean up QML Compilation cache if application fails to start
-    correctly.
-
- -- Ubuntu daily release <[e-mail]>  Thu, 30 Oct 2014 11:55:27 +0000
-
-qtmir (0.4.4+14.10.20141013-0ubuntu1) utopic; urgency=medium
-
-  [ Daniel d'Andrada ]
-  * Turn UbuntuKeyboardInfo into a QML singleton
-
-  [ Gerry Boland ]
-  * Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading
-    localized keys (LP: #1350360)
-
-  [ Michał Sawicz ]
-  * Ensure unity8-dash is less likely to be killed than other background
-    apps. (LP: #1379296)
-
-  [ Robert Carr ]
-  * Pass key auto-repeat flag through QtEventFeeder.
-
- -- Ubuntu daily release <[e-mail]>  Mon, 13 Oct 2014 10:08:04 +0000
-
-qtmir (0.4.3+14.10.20141010-0ubuntu1) utopic; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Cemil Azizoglu ]
-  * Rebuild for Mir 0.8.0.
-
- -- Ubuntu daily release <[e-mail]>  Fri, 10 Oct 2014 16:33:24 +0000
-
-qtmir (0.4.3+14.10.20141006-0ubuntu1) utopic; urgency=low
-
-  [ Michael Zanetti ]
-  * Fix some bugs in app lifecycle management.
-
-  [ Albert Astals ]
-  * Wait for ApplicationManager to be there
-
- -- Ubuntu daily release <[e-mail]>  Mon, 06 Oct 2014 12:00:01 +0000
-
-qtmir (0.4.3+14.10.20141001.5-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * CONFIG+=no_tests to avoid building the tests and therefore speed up
-    the build
-  * Provide a global clipboard via D-Bus (LP: #1367814)
-
-  [ josharenson ]
-  * Remove check to see if application is already focused before
-    focusing.
-
-  [ Robert Carr ]
-  * MirSurfaceItem::consume Set motion event tooltypes based on
-    QTouchPoints (LP: #1371282)
-
-  [ Gerry Boland ]
-  * Fix AppMan handling Upstart resuming a Stopped application
-
- -- Ubuntu daily release <[e-mail]>  Wed, 01 Oct 2014 18:43:00 +0000
-
-qtmir (0.4.3+14.10.20140922.1-0ubuntu1) utopic; urgency=low
-
-  [ Gerry Boland ]
-  * Expose Mir surface orientation property to QML (LP: #1288332)
-  * Add splash screen properties to Application
-
-  [ Florian Boucault ]
-  * Add splash screen properties to Application
-
-  [ Daniel d'Andrada ]
-  * Add splash screen properties to Application
-
- -- Ubuntu daily release <[e-mail]>  Mon, 22 Sep 2014 17:38:51 +0000
-
-qtmir (0.4.3+14.10.20140918.3-0ubuntu1) utopic; urgency=low
-
-  [ Gerry Boland ]
-  * TaskController may call processStarted synchronously, so check for
-    that in startApplication before adding (LP: #1371047)
-
- -- Ubuntu daily release <[e-mail]>  Thu, 18 Sep 2014 16:57:48 +0000
-
-qtmir (0.4.3+14.10.20140918.1-0ubuntu1) utopic; urgency=low
-
-  [ Gerry Boland ]
-  * Fix unstable test - be more careful about synchronizing the Qt image
-    provider and Mir snapshot threads
-
- -- Ubuntu daily release <[e-mail]>  Thu, 18 Sep 2014 09:38:52 +0000
-
-qtmir (0.4.3+14.10.20140915-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * MirSurfaceItem: Ensure all touch sequences sent to Mir surface are
-    properly ended.
-
- -- Ubuntu daily release <[e-mail]>  Mon, 15 Sep 2014 14:50:16 +0000
-
-qtmir (0.4.3+14.10.20140907-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * QtEventFeeder: validate touches before sending them to Qt
-
-  [ josharenson ]
-  * Fix a small typo in the README file
-
-  [ Alan Griffiths ]
-  * Provide Mir with a handler for any command-line arguments it fails
-    to parse. For the moment, these are simply ignored.
-
-  [ Gerry Boland ]
-  * Add LTTng tracepoints
-
- -- Ubuntu daily release <[e-mail]>  Sun, 07 Sep 2014 19:42:56 +0000
-
-qtmir (0.4.3+14.10.20140903-0ubuntu1) utopic; urgency=medium
-
-  [ Nick Dedekind ]
-  * Use a model for child surfaces/sessions. Add surface tests.
-  * Support for nesting prompt sessions.
-
-
- -- Ubuntu daily release <[e-mail]>  Wed, 03 Sep 2014 08:03:52 +0000
-
-qtmir (0.4.2+14.10.20140829-0ubuntu1) utopic; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Cemil Azizoglu ]
-  * Rebuild for the Mir 0.7.0 release.
-
- -- Ubuntu daily release <[e-mail]>  Fri, 29 Aug 2014 18:59:49 +0000
-
-qtmir (0.4.2+14.10.20140825-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * Revamp screenshotting to use an image provider again, removing
-    screenshot-related methods on Application
-
-  [ Daniel van Vugt ]
-  * Add support for building against Mir when it's installed somewhere
-    other than /usr (like with a custom $PKG_CONFIG_PATH).
-
- -- Ubuntu daily release <[e-mail]>  Mon, 25 Aug 2014 07:46:36 +0000
-
-qtmir (0.4.1+14.10.20140817-0ubuntu1) utopic; urgency=medium
-
-  [ Michał Sawicz ]
-  * Unrevert "MirSurfaceItem: always try to consume new mir frames"
-
- -- Ubuntu daily release <[e-mail]>  Sun, 17 Aug 2014 00:41:51 +0000
-
-qtmir (0.4.1+14.10.20140815.is.0.4.1+14.10.20140811.1-0ubuntu1) utopic; urgency=medium
-
-  * Reverting previous commit since unity8 started deadlocking in ap
-    test runs (requested by Saviq)
-
- -- Ricardo Salveti de Araujo <[e-mail]>  Sat, 16 Aug 2014 17:18:12 -0300
-
-qtmir (0.4.1+14.10.20140815-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * MirSurfaceItem: always try to consume new mir frames Otherwise those
-    frames will get dropped and MirSurfaceItem will therefore never use
-    them, being left displaying an old, stale, frame until the
-    application renders again.This could happen for instance if an
-    application was rendering between the time the Application object
-    goes to Suspended state and the actual process getting SIG_STOPPED
-    (ie, suspended for real). Frames rendered in this interval were
-    getting dropped and once that app was resumed and its MirSurfaceItem
-    brought to front the user would see an old stale frame until some
-    new event caused the application to render a new frame (e.g. an
-    input event) (LP: #1353374)
-
- -- Ubuntu daily release <[e-mail]>  Fri, 15 Aug 2014 17:13:24 +0000
-
-qtmir (0.4.1+14.10.20140811.1-0ubuntu1) utopic; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Michał Sawicz ]
-  * Bumped dependency for Mir 0.6.0. Switch to using supported API
-    (the_ipc_factory -> new_ipc_factory).
-
-  [ Cemil Azizoglu ]
-  * Bumped dependency for Mir 0.6.0. Switch to using supported API
-    (the_ipc_factory -> new_ipc_factory).
-
-  [ Alan Griffiths ]
-  * Bumped dependency for Mir 0.6.0. Switch to using supported API
-    (the_ipc_factory -> new_ipc_factory).
-
-  [ Kevin Gunn ]
-  * Bumped dependency for Mir 0.6.0. Switch to using supported API
-    (the_ipc_factory -> new_ipc_factory).
-
- -- Ubuntu daily release <[e-mail]>  Mon, 11 Aug 2014 21:12:34 +0000
-
-qtmir (0.4.1+14.10.20140811-0ubuntu1) utopic; urgency=low
-
-  [ Gerry Boland ]
-  * AppMan: fix dbus GetWindowStack & GetAppFromPid APIs. On suspend,
-    mark focused application unfocused, and reverse on resume.
-
- -- Ubuntu daily release <[e-mail]>  Mon, 11 Aug 2014 15:53:40 +0000
-
-qtmir (0.4.1+14.10.20140808-0ubuntu1) utopic; urgency=medium
-
-  [ Nick Dedekind ]
-  * Added prompt surfaces to application
-
- -- Ubuntu daily release <[e-mail]>  Fri, 08 Aug 2014 12:19:29 +0000
-
-qtmir (0.4.0+14.10.20140805.1-0ubuntu1) utopic; urgency=low
-
-  [ Nick Dedekind ]
-  * Only add prompt session surfaces to the surface stack once their
-    first frame has been drawn.
-
- -- Ubuntu daily release <[e-mail]>  Tue, 05 Aug 2014 19:23:27 +0000
-
-qtmir (0.4.0+14.10.20140805-0ubuntu1) utopic; urgency=low
-
-  [ Daniel d'Andrada ]
-  * Don't take screenshots automatically and emit focusRequested()
-    reliably (LP: #1350917)
-
- -- Ubuntu daily release <[e-mail]>  Tue, 05 Aug 2014 12:01:39 +0000
-
-qtmir (0.4.0+14.10.20140729-0ubuntu1) utopic; urgency=medium
-
-  [ Gerry Boland ]
-  * Update for Mir 0.4.0 compatibility
-  * Remove unneeded properties from SurfaceManager and restore support
-    for surface with no app parent
-  * Add patches to ubuntuclient plugin to enable sharing of GL context -
-    needed for oxide
-  * Rename client plugin to ubuntumirclient (to match that of qtubuntu)
-    There are some apps which check the QPA name is ubuntumirclient, and
-    fail with ubuntuclient. Worst offender is Oxide, which is hard to
-    rebuild, so this change is easier fix.
-  * Revert 125, incorrect branch merged
-  * Rename client plugin to ubuntumirclient (to match that of qtubuntu)
-    There are some apps which check the QPA name is ubuntumirclient, and
-    fail with ubuntuclient. Worst offender is Oxide, which is hard to
-    rebuild, so this change is easier fix.
-  * Remove surface observer on MirSurfaceItem destruction
-  * New apps placed at start of model and are focused immediately.
-    AppMan model has proper surface and fullscreen roles now. Whitespace
-    fixes
-  * Enable UbuntuPlatformServices for a mirserver
-  * Fix FTBFS - header file moved
-  * Remove ubuntumirclient plugin as it moved to qtubuntu
-  * Empty commit to force rebuild for Qt5.3
-  * debian: update package name, fixes dependency wait in PPA
-  * Fix Qt5.3 compile - QQmlProfiler changed to QQuickProfiler
-  * Update README, rename root pro file to match project name
-  * debian: replace old libplatform-api-dev with newer libubuntu-
-    application-api-dev
-  * Fix lifecycle by pulling latest unity-mir code. Rename QML module
-    back to Unity.Application. Import unity-mir tests. Use category
-    logging
-  * Restore code to override side-stage apps to be on main stage on
-    single-stage devices
-  * Remove unused *toBeFocused state savers
-  * debian: update mir & papi version dependencies
-  * Fix out-of-tree builds
-  * Using const QString ref to save possible QString copy
-  * Small header file cleaning
-  * Fix test fails - do not run moc again on headers used by tests
-  * Downgrade error warning of unmanaged session startup
-  * Simplify focus logic, fix tablet lifecycle
-  * Workaround GL/GLES conflict between Qt and Mir. Split into 3
-    packages: GL qpa, GLES qpa & QML plugin Mir is GLES only. Qt on
-    desktop is desktop-GL only. To workaround this, (ab)use the fact
-    that MESA on the desktop allows you to bind GL apis to a GLES
-    context via eglBindAPI. To use this, need to compile with QPA
-    separately for GL and GLES targets. Thus need to split the packaging
-    into: + qtmir-android - qpa plugin for GLES targets + qtmir-desktop
-    - qpa plugin for desktop-GL targets (uses MESA hack) +
-    qtdeclarative5-qtmir-plugin - the QML plugin Also stopped unit tests
-    from being installed
-  * Re-enable Buffer Queueing OpenGL, should improve graphics
-    performance
-  * Remove refresh-rate override as Mir now returns correct value
-  * MirGLContext - temporary gl context from mir does not have
-    attributes defined by GLConfig applied, so need to do so manually
-  * DisplayWindow listens for Hide/Show events with its event handler,
-    not via a static variable
-  * QtEventFeeder - add deconstructor to delete the mTouchDevice
-  * Application: delete TODO comment in setSession as nonsensical
-  * SessionName removed. PID matching was introduced some time ago and
-    so session name unnecessary
-  * Application: remove hack to guess app supported orientations,
-    implement properly later
-  * Fixed threading issue when screen-shotting application about to be
-    stopped. By Nick Dedekind
-  * Revert rev 179, add comment to clarify
-  * Application: replace direct call into MirSurfaceItem with a
-    signal/slot. Removes FIXME
-  * MirSurfaceItem: setting unfocused on creation breaks camera & videos
-    app, so disabling and added fixme
-  * Add FIXME about the custom roles
-  * Remove redundant comment
-  * Remove ApplicationManager::topmostApplication
-  * AppMan: if foreground app closes, set all unfocused to let shell
-    decide what next to focus
-  * Useless static_cast removed
-  * DebugHelpers: do not use default state for last option in the enum
-    today, the enum may grow in future
-  * MirBufferSGTexture: remove the Qt5.3 ifdefs, were probably broken
-    for older Qt versions
-  * MirSurfaceItem - standardize on qCDebug(QTMIR_SURFACES)
-  * MirSurfaceManager: generate roleNames only on read
-  * MirSurfaceManager: remove commented line
-  * TaskController: add a few more consts
-  * Removed WindowScreenshotProvider as not needed for now
-  * AppMan: be slightly more verbose with desktop file locating for
-    desktop_file_hint. Also use faster exists() static function
-  * AppMan: data - remove nonsensical default role
-  * ProcessController: expand documentation
-  * Clarify licences
-  * Give AppMan & SurfMan objectNames
-  * MirSurfaceItem: do not print keystrokes to log
-  * Fix crash bug - disable input events going to MirSurfaceItem whose
-    backing mir surface was destroyed
-  * SurfaceManager: do not add each surface to the model twice silly
-  * debian: only use gcc4.9 compiler to prevent ABI breaks due to some
-    C++11 features still being experimental in gcc
-  * AppMan: emit unfocus dbus event on suspend, and focus on resume
-  * Revert 214 - breaks install of qtmir and qtubuntu
-  * Input Event timestamp - do not overwrite timestamp of events sent to
-    client
-
-  [ Nick Dedekind ]
-  * Compatibility with mir-0.5
-
-  [ Robert Bruce Park ]
-  * CI Train packaging cleanup. Minor packaging cleanup for CI Train
-    standards.
-  * Slightly more readable debian/rules.
-
-  [ Michael Zanetti ]
-  * append newly focused apps instead of prepending them. Allows the ui
-    to do the regular app focused animation for newly started apps too
-  * Fix multi touch points on mirsurfaceitems. Patch kindly provided by
-    anpok.
-  * also mir specific key codes through the QKeyEvent
-
-  [ Michael Terry ]
-  * Use virtual package names in Conflicts/Replaces fields and clean
-    build dirs when doing dh_clean.
-
-  [ Daniel d'Andrada ]
-  * ubuntuclient: Properly handle mir's resize event Take it as a
-    promise for a future buffer size instead of immediately obeying it.
-  * Some MirSurfaceItem fixes Don't assume that it always have an
-    Application. Slightly improve its ownership mess.
-  * Work around crash in MirSurfaceManager::onSurfaceAttributeChanged
-  * Improve debug output of surfaces handled by MirSurfaceManager
-  * Make mirserver QPA implement QPlatformIntegration::inputContext() So
-    that shell can get a virtual keyboard
-  * Wait for screen orientation to stabilize before committing to it
-  * Reduce orientation stabilization time and cancel pending change when
-    facing up/down
-  * Merge multiple qml size changes into a single mir surface resize
-    Resizing a mir surface is a costly operation and qml items can get
-    resized multiple times in a single event loop iteration. Besides, a
-    qml item changes its width and height separately
-  * Add WindowScreenshotProvider
-  * s/upstart-app-launch-2/ubuntu-app-launch-2
-  * Add clipboard support had to remove the dependency of mirserver to
-    platform-api-client as it caused a clash as both libs are loading
-    unityrpc.proto. That's a protobuffer limitation. Added the protobuf
-    generated files directly (unityrpc.cpp and unityrpc.h) as I couldn't
-    bend qmake to my will.
-  * UbuntuPlatformServices is no longer shared by both QPAs
-  * Update Application::fullscreen when the application gets its surface
-  * MirSurfaceManager: s/DLOG/qCDebug Use Qt's new categorized logging
-    system
-  * MirSurfaceManager: improve debug output
-  * Hold back this commit for now as qtmir trunk still uses an old mir
-    version
-  * adapt to latest mir/devel + input_sender branch
-  * MirSurfaceManager: improve debug output
-  * Revert to the old ways regarding rotation Where unity8 doesn't move
-    and apps rotate by themselves. Retake that rotation approach at a
-    later time
-  * Forward item focus to the underlying mir surface
-  * Dispatch keys to mir surface
-  * Add a comment with the rationale behind the frame dropper
-  * Fix copyright headers
-  * Fix and update debian/copyright
-  * Removing debian/qtdeclarative5-qtmir-plugin.maintscript This came
-    with the copy-pasting unity-mir packaging. Makes no sense in qtmir
-    as it never installed a com.canonical.Unity.conf file in the first
-    place. That's unity-mir's problems.
-  * Add a TODO notice
-  * Fix copy-and-paste error in log message
-  * Improve Application::setState debug output
-
-  [ Kevin Gunn ]
-  * merge lp:~nick-dedekind/qtmir/prompt_sessions
-  * no change, rebuild
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
- -- Ubuntu daily release <[e-mail]>  Tue, 29 Jul 2014 15:13:00 +0000
-
-qtmir (0.0.1-ppa5) utopic; urgency=medium
-
-  * packaging works now
-
- -- Michael Zanetti <[e-mail]>  Fri, 16 May 2014 14:04:29 +0200
-
-qtmir (0.0.1-ppa1) utopic; urgency=medium
-
-  * Initial release.
-
- -- Michael Zanetti <[e-mail]>  Wed, 14 May 2014 14:28:17 +0200

=== removed file 'miral-qt/debian/compat'
--- miral-qt/debian/compat	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-9

=== removed file 'miral-qt/debian/control'
--- miral-qt/debian/control	2016-11-01 19:33:51 +0000
+++ miral-qt/debian/control	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-Source: qtmir
-Section: libs
-Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
-               cmake-extras (>= 0.3),
-               debhelper (>= 9),
-               google-mock (>= 1.6.0+svn437),
-               libcgmanager-dev,
-               libcontent-hub-dev (>= 0.2),
-               libfontconfig1-dev,
-               libgles2-mesa-dev,
-               libglib2.0-dev,
-               libgsettings-qt-dev,
-               liblttng-ust-dev,
-               libmirclient-dev (>= 0.22.0),
-               libmircommon-dev (>= 0.22.0),
-               libmirserver-dev (>= 0.22.0),
-               libmtdev-dev,
-               libprocess-cpp-dev,
-               libqt5sensors5-dev,
-               libqtdbusmock1-dev (>= 0.2),
-               libqtdbustest1-dev (>= 0.2),
-               libubuntu-app-launch2-dev (>= 0.9),
-               libubuntu-application-api-dev (>= 2.1.0),
-               libudev-dev,
-               libunity-api-dev (>= 7.120),
-               liburl-dispatcher1-dev,
-               libxkbcommon-dev,
-               libxrender-dev,
-               mir-renderer-gl-dev (>= 0.24.0),
-               mirtest-dev (>= 0.24.0),
-               pkg-config,
-# lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
-               python3:any,
-               qt5-default,
-               qtbase5-dev,
-               qtbase5-private-dev,
-               qtdeclarative5-dev,
-               qtdeclarative5-private-dev,
-               quilt,
-# libmirserver-dev should have brought this dep. Bug lp:1617435
-               uuid-dev,
-Standards-Version: 3.9.5
-Homepage: https://launchpad.net/qtmir
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-Bzr: lp:qtmir
-Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/trunk/files
-
-Package: qtmir-android
-Architecture: armhf
-Multi-Arch: same
-Conflicts: libqtmir,
-           qtmir-desktop,
-           qtubuntu-desktop,
-Replaces: libqtmir,
-          qtmir-desktop,
-          qtubuntu-desktop,
-Provides: qtmir,
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile)
- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
- a Mir server. It also exposes some internal Mir functionality.
- .
- This variant of the package is for Android-based phones and tablets.
-
-Package: qtmir-desktop
-Architecture: any
-Multi-Arch: same
-Conflicts: qtmir-android,
-           qtubuntu-android,
-Replaces: libqtmir,
-          qtmir-android,
-          qtubuntu-android,
-Provides: qtmir,
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop)
- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
- a Mir server. It also exposes some internal Mir functionality.
- .
- This variant of the package is for GNU-based desktops.
-
-Package: qtdeclarative5-qtmir-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: libqtmir,
-          libunity-mir1,
-Conflicts: libqtmir,
-           libunity-mir1,
-Provides: unity-application-impl,
-          unity-application-impl-23,
-Description: Qt plugin for Unity specific Mir APIs
- QtMir provides Qt/QML bindings for Mir features that are exposed through the
- qtmir-desktop or qtmir-android QPA plugin such as Application management
- (start/stop/suspend/resume) and surface management.
-
-Package: qtmir-tests
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: autopilot-qt5,
-         littler,
-         lttng-tools,
-         mir-test-tools,
-         python3-autopilot,
-         python3-babeltrace,
-         python3-evdev,
-         python3-mir-perf-framework,
-         qtdeclarative5-qtmir-plugin,
-         qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: QtMir tests and demos
- This package provides benchmark tests and a simple shell and client using the
- QtMir QPA.

=== removed file 'miral-qt/debian/copyright'
--- miral-qt/debian/copyright	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qtmir
-
-Files: *
-Copyright: 2013-2015 Canonical Ltd.
-License: LGPL-3
-
-Files: debian/*
-Copyright: 2013-2015 Canonical Ltd.
-License: GPL-3
-
-Files: tests/*
-Copyright: 2013-2015 Canonical Ltd.
-License: GPL-3
-
-Files: cmake/modules/FindQt5PlatformSupport.cmake
-Copyright: 2014 Alex Merry <[e-mail]>
-           2014 Martin Gräßlin <[e-mail]>
-License: BSD-3-clause
-
-License: LGPL-3
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 3 of
- the License.
- .
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'.
-
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 3 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public License
- version 3 can be found in the file /usr/share/common-licenses/GPL-3.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

=== removed file 'miral-qt/debian/docs'
--- miral-qt/debian/docs	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/docs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-README

=== removed directory 'miral-qt/debian/gles-patches'
=== removed file 'miral-qt/debian/gles-patches/convert-to-gles.patch'
--- miral-qt/debian/gles-patches/convert-to-gles.patch	2016-11-01 19:33:51 +0000
+++ miral-qt/debian/gles-patches/convert-to-gles.patch	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-Index: inline-gles-quilt/debian/control
-===================================================================
---- inline-gles-quilt.orig/debian/control
-+++ inline-gles-quilt/debian/control
-@@ -1,4 +1,4 @@
--Source: qtmir
-+Source: qtmir-gles
- Section: libs
- Priority: optional
- Maintainer: Ubuntu Developers <[e-mail]>
-@@ -16,7 +16,13 @@ Build-Depends: cmake,
-                libmirserver-dev (>= 0.24.0),
-                libmtdev-dev,
-                libprocess-cpp-dev,
-+               libqt5gui5-gles,
-+               libqt5quick5-gles,
-+               libqt5quickparticles5-gles,
-+               libqt5quicktest5,
-+               libqt5quickwidgets5-gles,
-                libqt5sensors5-dev,
-+               libqt5test5,
-                libqtdbusmock1-dev (>= 0.2),
-                libqtdbustest1-dev (>= 0.2),
-                libubuntu-app-launch2-dev,
-@@ -31,8 +37,8 @@ Build-Depends: cmake,
- # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
-                python3:any,
-                qt5-default,
--               qtbase5-dev,
--               qtbase5-private-dev,
-+               qtbase5-gles-dev,
-+               qtbase5-private-gles-dev,
-                qtdeclarative5-dev,
-                qtdeclarative5-private-dev,
-                quilt,
-@@ -45,7 +51,7 @@ Vcs-Bzr: lp:qtmir
- Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/trunk/files
- 
- Package: qtmir-android
--Architecture: armhf
-+Architecture: amd64 i386
- Multi-Arch: same
- Conflicts: libqtmir,
-            qtmir-desktop,
-@@ -56,65 +62,10 @@ Replaces: libqtmir,
- Provides: qtmir,
- Depends: ${misc:Depends},
-          ${shlibs:Depends},
--Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile)
-+Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) - OpenGLES
-  QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
-  It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
-  a Mir server. It also exposes some internal Mir functionality.
-  .
-- This variant of the package is for Android-based phones and tablets.
--
--Package: qtmir-desktop
--Architecture: any
--Multi-Arch: same
--Conflicts: qtmir-android,
--           qtubuntu-android,
--Replaces: libqtmir,
--          qtmir-android,
--          qtubuntu-android,
--Provides: qtmir,
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop)
-- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
-- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
-- a Mir server. It also exposes some internal Mir functionality.
-- .
-- This variant of the package is for GNU-based desktops.
--
--Package: qtdeclarative5-qtmir-plugin
--Architecture: any
--Multi-Arch: same
--Pre-Depends: ${misc:Pre-Depends},
--Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
--         ${misc:Depends},
--         ${shlibs:Depends},
--Replaces: libqtmir,
--          libunity-mir1,
--Conflicts: libqtmir,
--           libunity-mir1,
--Provides: unity-application-impl,
--          unity-application-impl-23,
--Description: Qt plugin for Unity specific Mir APIs
-- QtMir provides Qt/QML bindings for Mir features that are exposed through the
-- qtmir-desktop or qtmir-android QPA plugin such as Application management
-- (start/stop/suspend/resume) and surface management.
--
--Package: qtmir-tests
--Architecture: any
--Multi-Arch: same
--Pre-Depends: ${misc:Pre-Depends},
--Depends: autopilot-qt5,
--         littler,
--         lttng-tools,
--         mir-test-tools,
--         python3-autopilot,
--         python3-babeltrace,
--         python3-evdev,
--         python3-mir-perf-framework,
--         qtdeclarative5-qtmir-plugin,
--         qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
--         ${misc:Depends},
--         ${shlibs:Depends},
--Description: QtMir tests and demos
-- This package provides benchmark tests and a simple shell and client using the
-- QtMir QPA.
-+ This variant of the package is for Android-based phones and tablets (built
-+ against the OpenGLES variant of qtbase).
-Index: inline-gles-quilt/debian/rules
-===================================================================
---- inline-gles-quilt.orig/debian/rules
-+++ inline-gles-quilt/debian/rules
-@@ -3,60 +3,28 @@
- 
- export DPKG_GENSYMBOLS_CHECK_LEVEL=4
- 
--include /usr/share/dpkg/default.mk
--
- ANDROID_DIR = build-android
--DESKTOP_DIR = build-desktop
- TMP1_DIR = $(CURDIR)/debian/tmp1
--TMP2_DIR = $(CURDIR)/debian/tmp2
--
--# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
--DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
--gles2_architectures = armhf
--
--USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
- 
- %:
- 	dh $@ --parallel --fail-missing
- 
- override_dh_clean:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
- 	rm -rf $(TMP1_DIR)
--endif
--	rm -rf $(TMP2_DIR)
- 	dh_clean
- 
- override_dh_auto_configure:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
- 	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
--# See comment in CMakeLists.txt
--	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
--else
--	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
--endif
- 
- override_dh_auto_build:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
- 	dh_auto_build -B$(ANDROID_DIR)
--endif
--	dh_auto_build -B$(DESKTOP_DIR)
- 
- override_dh_auto_test:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
- 	dh_auto_test -B$(ANDROID_DIR)
--endif
--	dh_auto_test -B$(DESKTOP_DIR)
- 
- override_dh_auto_install:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
- 	dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
--endif
--	dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
- 
- override_dh_install:
--ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-+	cat $(CURDIR)/debian/qtmir-tests.install $(CURDIR)/debian/qtdeclarative5-qtmir-plugin.install | xargs -I% sh -c "rm -rf $(TMP1_DIR)/%"
- 	dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
--endif
--	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
--	dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
--	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests

=== removed file 'miral-qt/debian/gles-patches/series'
--- miral-qt/debian/gles-patches/series	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/gles-patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-convert-to-gles.patch

=== removed file 'miral-qt/debian/qtdeclarative5-qtmir-plugin.install'
--- miral-qt/debian/qtdeclarative5-qtmir-plugin.install	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/qtdeclarative5-qtmir-plugin.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/qml/*
-usr/share/glib-2.0/schemas

=== removed file 'miral-qt/debian/qtmir-android.install'
--- miral-qt/debian/qtmir-android.install	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/qtmir-android.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/qt5/plugins/platforms/*

=== removed file 'miral-qt/debian/qtmir-desktop.install'
--- miral-qt/debian/qtmir-desktop.install	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/qtmir-desktop.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/qt5/plugins/platforms/*

=== removed file 'miral-qt/debian/qtmir-tests.install'
--- miral-qt/debian/qtmir-tests.install	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/qtmir-tests.install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/qtmir-demo-client
-usr/bin/qtmir-demo-shell
-usr/share/applications/qtmir-demo-client.desktop
-usr/share/qtmir/benchmarks/*
-usr/share/qtmir/qtmir-demo-client/*
-usr/share/qtmir/qtmir-demo-shell/

=== removed file 'miral-qt/debian/rules'
--- miral-qt/debian/rules	2016-06-01 22:06:51 +0000
+++ miral-qt/debian/rules	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
-include /usr/share/dpkg/default.mk
-
-ANDROID_DIR = build-android
-DESKTOP_DIR = build-desktop
-TMP1_DIR = $(CURDIR)/debian/tmp1
-TMP2_DIR = $(CURDIR)/debian/tmp2
-
-# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-gles2_architectures = armhf
-
-USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
-
-%:
-	dh $@ --parallel --fail-missing
-
-override_dh_clean:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	rm -rf $(TMP1_DIR)
-endif
-	rm -rf $(TMP2_DIR)
-	dh_clean
-
-override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
-# See comment in CMakeLists.txt
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
-else
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
-endif
-
-override_dh_auto_build:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	dh_auto_build -B$(ANDROID_DIR)
-endif
-	dh_auto_build -B$(DESKTOP_DIR)
-
-override_dh_auto_test:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	dh_auto_test -B$(ANDROID_DIR)
-endif
-	dh_auto_test -B$(DESKTOP_DIR)
-
-override_dh_auto_install:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
-endif
-	dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
-
-override_dh_install:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
-endif
-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
-	dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests

=== removed directory 'miral-qt/demos'
=== removed file 'miral-qt/demos/CMakeLists.txt'
--- miral-qt/demos/CMakeLists.txt	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
-
-add_subdirectory(qml-demo-client)
-add_subdirectory(qml-demo-shell)
\ No newline at end of file

=== removed file 'miral-qt/demos/paths.h.in'
--- miral-qt/demos/paths.h.in	2016-07-25 15:32:21 +0000
+++ miral-qt/demos/paths.h.in	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PATHS_H
-#define PATHS_H
-
-// Qt
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtGui/QIcon>
-#include <QtQml/QQmlEngine>
-#include <QStandardPaths>
-
-inline bool isRunningInstalled() {
-    static bool installed = (QCoreApplication::applicationDirPath() ==
-                             QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
-    return installed;
-}
-
-inline QString qmlDirectory() {
-    if (isRunningInstalled()) {
-        return QString("@CMAKE_INSTALL_PREFIX@/@QTMIR_DATA_DIR@/");
-    } else {
-        return QString("@CMAKE_SOURCE_DIR@/miral-qt/demos/");
-    }
-}
-
-inline QString qmlPluginDirectory() {
-    if (isRunningInstalled()) {
-        return QString("@QML_MODULE_INSTALL_DIR@/");
-    } else {
-        return QString("@CMAKE_BINARY_DIR@/miral-qt/src/modules/");
-    }
-}
-
-inline QString qpaPluginDirectory() {
-    if (isRunningInstalled()) {
-        return QString("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qt5/plugins/platforms/");
-    } else {
-        //return QString("@CMAKE_BINARY_DIR@/miral-qt/src/platforms/mirserver/"); //miral moving it out of here
-        return QString("@CMAKE_BINARY_DIR@/lib/");
-    }
-}
-
-#endif

=== removed directory 'miral-qt/demos/qml-demo-client'
=== removed file 'miral-qt/demos/qml-demo-client/CMakeLists.txt'
--- miral-qt/demos/qml-demo-client/CMakeLists.txt	2016-09-15 21:11:15 +0000
+++ miral-qt/demos/qml-demo-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-set(DEMO_CLIENT qtmir-demo-client)
-configure_file(${DEMO_CLIENT}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop @ONLY)
-
-include_directories(
-    SYSTEM
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-)
-
-add_executable(${DEMO_CLIENT}
-    main.cpp
-)
-
-target_link_libraries(
-    ${DEMO_CLIENT}
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Qml
-    Qt5::Quick
-)
-
-file(GLOB QML_JS_FILES *.qml *.js *.png)
-
-# install binaries
-install(TARGETS ${DEMO_CLIENT}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-
-install(FILES
-    ${QML_JS_FILES}
-    DESTINATION ${QTMIR_DATA_DIR}/${DEMO_CLIENT}
-)
-
-install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
-)
\ No newline at end of file

=== removed file 'miral-qt/demos/qml-demo-client/MovingRect.qml'
--- miral-qt/demos/qml-demo-client/MovingRect.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-client/MovingRect.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: movingRect
-    width: 80
-    height: 80
-    color: "red"
-
-    property real maxX: parent.width - width
-    property real targetX: maxX
-
-    function flipTargetX() {
-        if (targetX == 0) {
-            targetX = maxX
-        } else {
-            targetX = 0
-        }
-    }
-
-    Timer {
-        property real step: 4
-        repeat: true
-        running: true
-        interval: 1000 / 60
-        onTriggered: {
-            if (x < targetX) {
-                if (x + step > targetX) {
-                    x = targetX;
-                } else {
-                    x += step;
-                }
-            } else {
-                if (x - step < targetX) {
-                    x = targetX;
-                } else {
-                    x -= step;
-                }
-            }
-        }
-    }
-
-    onXChanged: {
-        if (x == targetX) {
-            flipTargetX();
-        }
-    }
-    onWidthChanged: {
-        if (targetX > 0) {
-            targetX = maxX;
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onPressed: {
-            parent.flipTargetX();
-        }
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-client/main.cpp'
--- miral-qt/demos/qml-demo-client/main.cpp	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-client/main.cpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Qt
-#include <QtQuick/QQuickView>
-#include <QtGui/QGuiApplication>
-#include <QDebug>
-#include <csignal>
-#include <libintl.h>
-#include <getopt.h>
-#include "../paths.h"
-
-// REMOVEME - Should be able to use qmlscene, but in order to use the mir benchmarking we need
-// to parse command line switches. Wait until MIR_SOCKET supported by the benchmark framework.
-
-int main(int argc, char **argv)
-{
-    int arg;
-    opterr = 0;
-    while ((arg = getopt (argc, argv, "hm:")) != -1)
-    {
-        switch (arg)
-        {
-        case 'm':
-            setenv("MIR_SOCKET", optarg, 1);
-            break;
-
-        case '?':
-        case 'h':
-        default:
-            puts(argv[0]);
-            puts("Usage:");
-            puts("    -m <Mir server socket>");
-            puts("    -h: this help text");
-            return -1;
-        }
-    }
-
-    QGuiApplication::setApplicationName("qml-demo-client");
-    QGuiApplication *application;
-
-    application = new QGuiApplication(argc, (char**)argv);
-    QQuickView* view = new QQuickView();
-    view->setResizeMode(QQuickView::SizeRootObjectToView);
-    view->setColor("black");
-    view->setTitle("Demo Client");
-    
-    QUrl source(::qmlDirectory() + "qtmir-demo-client/qml-demo-client.qml");
-
-    view->setSource(source);
-    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
-
-    view->showFullScreen();
-    int result = application->exec();
-
-    delete view;
-    delete application;
-
-    return result;
-}

=== removed file 'miral-qt/demos/qml-demo-client/qml-demo-client.qml'
--- miral-qt/demos/qml-demo-client/qml-demo-client.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-client/qml-demo-client.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    onWidthChanged: print("WIDTH", width)
-    onHeightChanged: print("HEIGHT", height)
-    width: 600
-    height: 80*6
-    color: "blue"
-
-    Column {
-        anchors.fill: parent
-        MovingRect {}
-        MovingRect {}
-        MovingRect {}
-        MovingRect {}
-        MovingRect {}
-        MovingRect {}
-    }
-
-    Rectangle {
-        id: flasher
-        width: 100
-        height: 100
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        color: (on) ? "yellow" : "green"
-        property bool on: false
-        Timer {
-            interval: 1000
-            repeat: true
-            running: true
-            onTriggered: flasher.on = !flasher.on
-        }
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-client/qtmir-demo-client.desktop.in'
--- miral-qt/demos/qml-demo-client/qtmir-demo-client.desktop.in	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-client/qtmir-demo-client.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=QtMir Demo Client
-Comment=QtMir demo client
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/qtmir-demo-client
-Terminal=false
-Icon=
-NoDisplay=false
-X-Ubuntu-Touch=true

=== removed directory 'miral-qt/demos/qml-demo-shell'
=== removed file 'miral-qt/demos/qml-demo-shell/Button.qml'
--- miral-qt/demos/qml-demo-shell/Button.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/Button.qml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-
-    signal clicked
-
-    property alias text: text.text
-
-    implicitHeight: 40
-    implicitWidth: 150
-
-    color: (mouseArea.pressed) ? "red" : "lightblue"
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: { root.clicked(); }
-    }
-
-    Text {
-        id: text
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-shell/CMakeLists.txt'
--- miral-qt/demos/qml-demo-shell/CMakeLists.txt	2016-09-15 21:11:15 +0000
+++ miral-qt/demos/qml-demo-shell/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-set(DEMO_SHELL qml-demo-shell)
-
-include_directories(
-    SYSTEM
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-)
-
-add_executable(${DEMO_SHELL}
-    pointerposition.cpp
-    main.cpp
-)
-
-target_link_libraries(
-    ${DEMO_SHELL}
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Qml
-    Qt5::Quick
-)
-
-file(GLOB QML_JS_FILES *.qml *.js *.png)
-
-# install binaries
-install(TARGETS ${DEMO_SHELL}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-
-install(FILES
-    ${QML_JS_FILES}
-    DESTINATION ${QTMIR_DATA_DIR}/${DEMO_SHELL}
-)

=== removed file 'miral-qt/demos/qml-demo-shell/ResizeArea.qml'
--- miral-qt/demos/qml-demo-shell/ResizeArea.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/ResizeArea.qml	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-import QtQuick 2.4
-import Unity.Application 0.1
-
-MouseArea {
-    id: root
-
-    // to be set from outside
-    property Item target
-    property real borderThickness
-
-    property bool leftBorder: false
-    property bool rightBorder: false
-    property bool topBorder: false
-    property bool bottomBorder: false
-
-    property bool dragging: false
-    property real startX
-    property real startY
-    property real startWidth
-    property real startHeight
-
-    hoverEnabled: true
-
-    property string cursorName: {
-        if (containsMouse || pressed) {
-            if (leftBorder && !topBorder && !bottomBorder) {
-                return "left_side";
-            } else if (rightBorder && !topBorder && !bottomBorder) {
-                return "right_side";
-            } else if (topBorder && !leftBorder && !rightBorder) {
-                return "top_side";
-            } else if (bottomBorder && !leftBorder && !rightBorder) {
-                return "bottom_side";
-            } else if (leftBorder && topBorder) {
-                return "top_left_corner";
-            } else if (leftBorder && bottomBorder) {
-                return "bottom_left_corner";
-            } else if (rightBorder && topBorder) {
-                return "top_right_corner";
-            } else if (rightBorder && bottomBorder) {
-                return "bottom_right_corner";
-            } else {
-                return "";
-            }
-        } else {
-            return "";
-        }
-    }
-    onCursorNameChanged: {
-        Mir.cursorName = cursorName;
-    }
-
-    function updateBorders() {
-        leftBorder = mouseX <= borderThickness;
-        rightBorder = mouseX >= width - borderThickness;
-        topBorder = mouseY <= borderThickness;
-        bottomBorder = mouseY >= height - borderThickness;
-    }
-
-    onPressedChanged: {
-        if (pressed) {
-            var pos = mapToItem(target.parent, mouseX, mouseY);
-            startX = pos.x;
-            startY = pos.y;
-            startWidth = target.width;
-            startHeight = target.height;
-            dragging = true;
-        } else {
-            dragging = false;
-            if (containsMouse) {
-                updateBorders();
-            }
-        }
-    }
-
-    onEntered: {
-        if (!pressed) {
-            updateBorders();
-        }
-    }
-
-    onPositionChanged: {
-        if (!pressed) {
-            updateBorders();
-        }
-
-        if (!dragging) {
-            return;
-        }
-
-        var pos = mapToItem(target.parent, mouse.x, mouse.y);
-
-        if (leftBorder) {
-            if (startX + startWidth - pos.x > target.minWidth) {
-                target.x = pos.x;
-                target.width = startX + startWidth - target.x;
-                startX = target.x;
-                startWidth = target.width;
-            }
-
-        } else if (rightBorder) {
-            var deltaX = pos.x - startX;
-            if (startWidth + deltaX >= target.minWidth) {
-                target.width = startWidth + deltaX;
-            } else {
-                target.width = target.minWidth;
-            }
-        }
-
-        if (topBorder) {
-            if (startY + startHeight - pos.y > target.minHeight) {
-                target.y = pos.y;
-                target.height = startY + startHeight - target.y;
-                startY = target.y;
-                startHeight = target.height;
-            }
-
-        } else if (bottomBorder) {
-            var deltaY = pos.y - startY;
-            if (startHeight + deltaY >= target.minHeight) {
-                target.height = startHeight + deltaY;
-            } else {
-                target.height = target.minHeight;
-            }
-        }
-    }
-}
-

=== removed file 'miral-qt/demos/qml-demo-shell/Shell.qml'
--- miral-qt/demos/qml-demo-shell/Shell.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/Shell.qml	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-import QtQuick 2.4
-import Unity.Application 0.1
-
-Rectangle {
-    id: root
-
-    focus: true
-    Keys.onVolumeUpPressed: {
-        console.log("\"Volume Up\" pressed");
-    }
-    Keys.onVolumeDownPressed: {
-        console.log("\"Volume Down\" pressed");
-    }
-
-    property bool resizeModeStretch: true
-
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: "lightsteelblue" }
-        GradientStop { position: 1.0; color: "pink" }
-    }
-
-    property bool thumbFriendlyBorders: false
-
-    MultiPointTouchArea {
-        anchors.fill: parent
-        mouseEnabled: false
-        onPressed: {
-            root.thumbFriendlyBorders = true;
-        }
-        onReleased: {
-            root.thumbFriendlyBorders = false;
-        }
-    }
-
-    Image {
-        id: unityLogo
-        source: "UnityLogo.png"
-        fillMode: Image.PreserveAspectFit
-        anchors.centerIn: parent
-        width: 600
-        height: 600
-
-        RotationAnimation {
-            id: logoAnimation
-            target: unityLogo
-            from: 0
-            to: 359
-            duration: 3000
-            easing.type: Easing.Linear
-            loops: Animation.Infinite
-        }
-
-        MultiPointTouchArea {
-            anchors.fill: parent
-            minimumTouchPoints:1
-            maximumTouchPoints:1
-            onPressed: {
-                if (logoAnimation.paused) {
-                    logoAnimation.resume();
-                } else if (logoAnimation.running) {
-                    logoAnimation.pause();
-                } else {
-                    logoAnimation.start();
-                }
-            }
-        }
-    }
-
-    Item {
-        id: windowContainer
-        anchors.fill: root
-    }
-
-    Rectangle {
-        id: quitButton
-        width: 60
-        height: 40
-        color: "red"
-        anchors { right: parent.right; bottom: parent.bottom }
-        Text {
-            anchors.centerIn: parent
-            text: "Quit"
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: Qt.quit()
-        }
-    }
-
-    Rectangle {
-        id: resizeButton
-        width: 90
-        height: 40
-        color: "blue"
-        anchors { right: quitButton.left; bottom: parent.bottom }
-        Text {
-            anchors.centerIn: parent
-            text: root.resizeModeStretch ? "Stretch" : "Wait Resize"
-            color: "white"
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { root.resizeModeStretch = !root.resizeModeStretch; }
-        }
-    }
-
-    Rectangle {
-        width: 40
-        height: 40
-        color: "green"
-        anchors { right: resizeButton.left; bottom: parent.bottom }
-        Text {
-            anchors.centerIn: parent
-            text: "⟳"
-            color: "white"
-            font.pixelSize: 35
-        }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { root.rotation += 180; }
-        }
-    }
-
-    Component {
-        id: windowStretchComponent
-        Window {
-            x: 50
-            y: 50
-            //width: 200
-            //height: 200
-            touchMode: root.thumbFriendlyBorders
-
-            onCloneRequested: {
-                var window = windowStretchComponent.createObject(windowContainer);
-                window.cloned = true;
-                window.surface = surface;
-            }
-        }
-    }
-
-    Component {
-        id: windowWaitResizeComponent
-        WindowBufferSized {
-            x: 50
-            y: 50
-            touchMode: root.thumbFriendlyBorders
-
-            onCloneRequested: {
-                var window = windowStretchComponent.createObject(windowContainer);
-                window.cloned = true;
-                window.surface = surface;
-            }
-        }
-    }
-
-    property var windowComponent: resizeModeStretch ? windowStretchComponent : windowWaitResizeComponent
-
-    Connections {
-        target: SurfaceManager
-        onSurfaceCreated: {
-            print("new surface", surface.name)
-
-            var window = windowComponent.createObject(windowContainer);
-            if (!window) {
-                console.warn(windowComponent.errorString());
-                return;
-            }
-
-            window.surface = surface;
-
-            openAnimation.target = window;
-            openAnimation.start();
-        }
-    }
-
-    NumberAnimation {
-        id: openAnimation
-        property: "x";
-        from: root.width; to: 10;
-        duration: 1200; easing.type: Easing.InOutQuad
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-shell/TitleBar.qml'
--- miral-qt/demos/qml-demo-shell/TitleBar.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/TitleBar.qml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-import QtQuick 2.4
-import Unity.Application 0.1
-
-Rectangle {
-    id: root
-    color: "brown"
-    height: 25
-
-    property Item target
-    property bool cloned: false
-    property bool closeRequested: false
-    signal cloneRequested()
-
-    MouseArea {
-        anchors.fill: parent
-        property real distanceX
-        property real distanceY
-        property bool dragging
-        onPressedChanged: {
-            if (pressed) {
-                var pos = mapToItem(root.target, mouseX, mouseY);
-                distanceX = pos.x;
-                distanceY = pos.y;
-                dragging = true;
-                Mir.cursorName = "grabbing";
-            } else {
-                dragging = false;
-                Mir.cursorName = "";
-            }
-        }
-        onMouseXChanged: {
-            if (dragging) {
-                var pos = mapToItem(root.target.parent, mouseX, mouseY);
-                root.target.x = pos.x - distanceX;
-                root.target.y = pos.y - distanceY;
-            }
-        }
-    }
-
-    Text {
-        visible: !root.cloned
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        text: "CLONE"
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                root.cloneRequested();
-            }
-        }
-    }
-
-    Text {
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        width: contentWidth
-        text: "X"
-        fontSizeMode: Text.VerticalFit
-        minimumPixelSize: 10; font.pixelSize: 72
-        font.weight: Font.Bold
-        horizontalAlignment: Text.AlignRight
-        verticalAlignment: Text.AlignVCenter
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                root.closeRequested = true;
-            }
-        }
-    }
-}
-

=== removed file 'miral-qt/demos/qml-demo-shell/UnityLogo.png'
Binary files miral-qt/demos/qml-demo-shell/UnityLogo.png	2016-06-01 22:06:51 +0000 and miral-qt/demos/qml-demo-shell/UnityLogo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'miral-qt/demos/qml-demo-shell/Window.qml'
--- miral-qt/demos/qml-demo-shell/Window.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/Window.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Rectangle {
-    id: root
-    color: "red"
-
-    property alias surface: surfaceItem.surface
-    property bool touchMode: false
-
-    width: surfaceItem.implicitWidth + 2*borderThickness
-    height: surfaceItem.implicitHeight + 2*borderThickness + titleBar.height
-
-    signal cloneRequested()
-    property bool cloned: false
-
-    onTouchModeChanged: {
-        if (touchMode) {
-            x -= borderThicknessTouch - borderThicknessMouse;
-            width += 2*(borderThicknessTouch - borderThicknessMouse);
-            y -= borderThicknessTouch - borderThicknessMouse;
-            height += 2*(borderThicknessTouch - borderThicknessMouse);
-        } else {
-            x += borderThicknessTouch - borderThicknessMouse;
-            width -= 2*(borderThicknessTouch - borderThicknessMouse);
-            y += borderThicknessTouch - borderThicknessMouse;
-            height -= 2*(borderThicknessTouch - borderThicknessMouse);
-        }
-    }
-
-    readonly property real minWidth: 100
-    readonly property real minHeight: 100
-
-    property real borderThickness: touchMode ? borderThicknessTouch : borderThicknessMouse
-    readonly property real borderThicknessMouse: 10
-    readonly property real borderThicknessTouch: 40
-
-    states: [
-        State {
-            name: "closed"
-            when: (surface && !surface.live) || titleBar.closeRequested
-        }
-    ]
-    transitions: [
-        Transition {
-            from: ""; to: "closed"
-            SequentialAnimation {
-                PropertyAnimation {
-                    target: root
-                    property: "scale"
-                    easing.type: Easing.InBack
-                    duration: 400
-                    from: 1.0
-                    to: 0.0
-                }
-                ScriptAction { script: { root.destroy(); } }
-            }
-        }
-    ]
-
-    ResizeArea {
-        anchors.fill: root
-        borderThickness: root.borderThickness
-        target: root
-    }
-
-    TitleBar {
-        id: titleBar
-        anchors.left: parent.left
-        anchors.leftMargin: root.borderThickness
-        anchors.right: parent.right
-        anchors.rightMargin: root.borderThickness
-        anchors.top: parent.top
-        anchors.topMargin: root.borderThickness
-
-        target: root
-        cloned: root.cloned
-        onCloneRequested: { root.cloneRequested(); }
-    }
-
-    MirSurfaceItem {
-        id: surfaceItem
-
-        anchors.top: titleBar.bottom
-        anchors.left: parent.left
-        anchors.leftMargin: root.borderThickness
-        anchors.right: parent.right
-        anchors.rightMargin: root.borderThickness
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: root.borderThickness
-
-        consumesInput: !root.cloned
-        surfaceWidth: root.cloned ? -1 : width
-        surfaceHeight: root.cloned ? -1 : height
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-shell/WindowBufferSized.qml'
--- miral-qt/demos/qml-demo-shell/WindowBufferSized.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/WindowBufferSized.qml	1970-01-01 00:00:00 +0000
@@ -1,178 +0,0 @@
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Rectangle {
-    id: root
-    color: "red"
-
-    property alias surface: surfaceItem.surface
-    property bool touchMode: false
-
-    width: surfaceItem.width + (borderThickness*2)
-    height: surfaceItem.height + titleBar.height + (borderThickness*2)
-
-    signal cloneRequested()
-
-    onTouchModeChanged: {
-        if (touchMode) {
-            x -= borderThicknessTouch - borderThicknessMouse;
-            width += 2*(borderThicknessTouch - borderThicknessMouse);
-            y -= borderThicknessTouch - borderThicknessMouse;
-            height += 2*(borderThicknessTouch - borderThicknessMouse);
-        } else {
-            x += borderThicknessTouch - borderThicknessMouse;
-            width -= 2*(borderThicknessTouch - borderThicknessMouse);
-            y += borderThicknessTouch - borderThicknessMouse;
-            height -= 2*(borderThicknessTouch - borderThicknessMouse);
-        }
-    }
-
-    readonly property real minWidth: 100
-    readonly property real minHeight: 100
-
-    property real borderThickness: touchMode ? borderThicknessTouch : borderThicknessMouse
-    readonly property real borderThicknessMouse: 10
-    readonly property real borderThicknessTouch: 40
-
-    states: [
-        State {
-            name: "closed"
-            when: (surface && !surface.live) || titleBar.closeRequested
-        }
-    ]
-    transitions: [
-        Transition {
-            from: ""; to: "closed"
-            SequentialAnimation {
-                PropertyAnimation {
-                    target: root
-                    property: "scale"
-                    easing.type: Easing.InBack
-                    duration: 400
-                    from: 1.0
-                    to: 0.0
-                }
-                ScriptAction { script: { root.destroy(); } }
-            }
-        }
-    ]
-
-
-    MouseArea {
-        id: resizeArea
-
-        anchors.fill: parent
-
-        property real startX
-        property real startY
-        property real startWidth
-        property real startHeight
-        property bool leftBorder
-        property bool rightBorder
-        property bool topBorder
-        property bool bottomBorder
-        property bool dragging
-        onPressedChanged: {
-            if (pressed) {
-                var pos = mapToItem(root.parent, mouseX, mouseY);
-                startX = pos.x;
-                startY = pos.y;
-                startWidth = surfaceItem.width;
-                startHeight = surfaceItem.height;
-                leftBorder = mouseX > 0 && mouseX < root.borderThickness;
-                rightBorder = mouseX > (root.width - root.borderThickness) && mouseX < root.width;
-                topBorder = mouseY > 0 && mouseY < root.borderThickness;
-                bottomBorder = mouseY > (root.height - root.borderThickness) && mouseY < root.height;
-                dragging = true;
-            } else {
-                dragging = false;
-            }
-        }
-
-        onMouseXChanged: {
-            if (!pressed || !dragging) {
-                return;
-            }
-
-            var pos = mapToItem(root.parent, mouseX, mouseY);
-
-            var deltaX = pos.x - startX;
-            if (leftBorder) {
-                if (startWidth - deltaX >= root.minWidth) {
-                    surfaceItem.surfaceWidth = startWidth - deltaX;
-                } else {
-                    surfaceItem.surfaceWidth = root.minWidth;
-                }
-            } else if (rightBorder) {
-                if (startWidth + deltaX >= root.minWidth) {
-                    surfaceItem.surfaceWidth = startWidth + deltaX;
-                } else {
-                    surfaceItem.surfaceWidth = root.minWidth;
-                }
-            }
-        }
-
-        onMouseYChanged: {
-            if (!pressed || !dragging) {
-                return;
-            }
-
-            var pos = mapToItem(root.parent, mouseX, mouseY);
-
-            var deltaY = pos.y - startY;
-            if (topBorder) {
-                if (startHeight - deltaY >= root.minHeight) {
-                    surfaceItem.surfaceHeight = startHeight - deltaY;
-                } else {
-                    surfaceItem.surfaceHeight = root.minHeight;
-                }
-            } else if (bottomBorder) {
-                if (startHeight + deltaY >= root.minHeight) {
-                    surfaceItem.surfaceHeight = startHeight + deltaY;
-                } else {
-                    surfaceItem.surfaceHeight = root.minHeight;
-                }
-            }
-        }
-    }
-
-    TitleBar {
-        id: titleBar
-        anchors.left: parent.left
-        anchors.leftMargin: root.borderThickness
-        anchors.right: parent.right
-        anchors.rightMargin: root.borderThickness
-        anchors.top: parent.top
-        anchors.topMargin: root.borderThickness
-
-        target: root
-        cloned: root.cloned
-        onCloneRequested: { root.cloneRequested(); }
-    }
-
-    MirSurfaceItem {
-        id: surfaceItem
-
-        width: surface ? surface.size.width : 50
-        height: surface ? surface.size.height : 50
-
-        onWidthChanged: {
-            if (resizeArea.dragging && resizeArea.leftBorder) {
-                root.x = resizeArea.startX + resizeArea.startWidth - surfaceItem.width;
-            }
-        }
-
-        onHeightChanged: {
-            if (resizeArea.dragging && resizeArea.topBorder) {
-                root.y = resizeArea.startY + resizeArea.startHeight - surfaceItem.height;
-            }
-        }
-
-        anchors.top: titleBar.bottom
-        anchors.left: parent.left
-        anchors.leftMargin: root.borderThickness
-
-        consumesInput: true
-    }
-}
-

=== removed file 'miral-qt/demos/qml-demo-shell/WindowModelDebugView.qml'
--- miral-qt/demos/qml-demo-shell/WindowModelDebugView.qml	2016-09-20 12:01:17 +0000
+++ miral-qt/demos/qml-demo-shell/WindowModelDebugView.qml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-import QtQuick 2.0
-import Unity.Application 0.1
-
-Column {
-    id: root
-    width: childrenRect.width
-    height: childrenRect.height
-    focus: false
-
-    property alias model: repeater.model
-
-    function stateString(state) {
-        switch(state) {
-        case Mir.HiddenState:         return "Hidden"
-        case Mir.RestoredState:       return "Restored"
-        case Mir.MinimizedState:      return "Minimized"
-        case Mir.MaximizedState:      return "Maximized"
-        case Mir.VertMaximizedState:  return "VertMax"
-        case Mir.FullscreenState:     return "Fullscreen"
-        case Mir.HorizMaximizedState: return "HorizMax"
-        case Mir.UnknownState:        return "Unknown"
-        }
-        return "Invalid"
-    }
-    function typeString(type) {
-        switch(type) {
-        case Mir.UnknownType:   return "Unknown"
-        case Mir.NormalType:        return "Normal"
-        case Mir.UtilityType:       return "Utility"
-        case Mir.DialogType:        return "Dialog"
-        case Mir.GlossType:         return "Gloss"
-        case Mir.FreeStyleType:     return "FreeStyle"
-        case Mir.MenuType:          return "Menu"
-        case Mir.InputMethodType:   return "InputMethod"
-        case Mir.SatelliteType:     return "Satellite"
-        case Mir.TipType:           return "Tip"
-        }
-        return "Invalid"
-    }
-
-    function geometryString(surface) {
-        return surface.position.x + "," + surface.position.y + " " + surface.size.width + "x" + surface.size.height
-    }
-
-
-    Text {
-        text: "Index\t\Name\tVisible\tState\tType\tGeometry"
-        height: (visible) ? implicitHeight : 0
-        visible: repeater.count > 0
-        color: "white"
-
-        Rectangle {
-            anchors.fill: parent
-            color: "blue"
-            z: -1
-        }
-    }
-    Repeater {
-        id: repeater
-        delegate: Text {
-            text: index + "\t" + surface.name + "\t" + surface.visible + "\t"
-                  + stateString(surface.state) + "\t" +  typeString(surface.type) + "\t" + geometryString(surface)
-            font.bold: surface.focused
-
-            Rectangle {
-                anchors.fill: parent
-                color: (index % 2) ? "white" : "lightblue"
-                z: -1
-            }
-        }
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-shell/main.cpp'
--- miral-qt/demos/qml-demo-shell/main.cpp	2016-09-13 22:06:39 +0000
+++ miral-qt/demos/qml-demo-shell/main.cpp	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Qt
-#include <QtQuick/QQuickView>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
-#include <QDebug>
-#include <libintl.h>
-#include "../paths.h"
-
-#include "pointerposition.h"
-
-// REMOVEME - Should be able to use qmlscene, but in order to use the mir benchmarking we need
-// to parse command line switches. Wait until MIR_SOCKET supported by the benchmark framework.
-
-int main(int argc, const char *argv[])
-{
-    setenv("QT_QPA_PLATFORM_PLUGIN_PATH", qPrintable(::qpaPluginDirectory()), 1 /* overwrite */);
-    setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);
-
-    QGuiApplication::setApplicationName("qml-demo-shell");
-    QGuiApplication *application;
-
-    application = new QGuiApplication(argc, (char**)argv);
-    QQuickView* view = new QQuickView();
-    view->engine()->addImportPath(::qmlPluginDirectory());
-    view->setResizeMode(QQuickView::SizeRootObjectToView);
-    view->setColor("lightgray");
-    view->setTitle("Demo Shell");
-    
-    qmlRegisterSingletonType<PointerPosition>("Mir.Pointer", 0, 1, "PointerPosition",
-        [](QQmlEngine*, QJSEngine*) -> QObject* { return PointerPosition::instance(); });
-
-    QUrl source(::qmlDirectory() + "qml-demo-shell/windowModel.qml");
-
-    view->setSource(source);
-    QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
-
-    view->showFullScreen();
-    int result = application->exec();
-
-    delete view;
-    delete application;
-
-    return result;
-}

=== removed file 'miral-qt/demos/qml-demo-shell/pointerposition.cpp'
--- miral-qt/demos/qml-demo-shell/pointerposition.cpp	2016-09-13 22:06:39 +0000
+++ miral-qt/demos/qml-demo-shell/pointerposition.cpp	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pointerposition.h"
-
-#include <QGuiApplication>
-#include <QMouseEvent>
-
-PointerPosition *PointerPosition::instance()
-{
-    static PointerPosition *pointerPosition = nullptr;
-    if (!pointerPosition) {
-        pointerPosition = new PointerPosition();
-    }
-    return pointerPosition;
-}
-
-bool PointerPosition::eventFilter(QObject */*object*/, QEvent *event)
-{
-    if (event->type() == QEvent::MouseMove) {
-        auto mouseEvent = static_cast<QMouseEvent*>(event);
-        if (m_x != mouseEvent->globalX()) {
-            m_x = mouseEvent->globalX();
-            Q_EMIT xChanged();
-        }
-        if (m_y != mouseEvent->globalY()) {
-            m_y = mouseEvent->globalY();
-            Q_EMIT yChanged();
-        }
-    }
-    return false;
-}
-
-PointerPosition::PointerPosition()
-    : QObject()
-{
-    qGuiApp->installEventFilter(this);
-}
-
-PointerPosition::~PointerPosition()
-{
-    qGuiApp->removeEventFilter(this);
-}

=== removed file 'miral-qt/demos/qml-demo-shell/pointerposition.h'
--- miral-qt/demos/qml-demo-shell/pointerposition.h	2016-09-13 22:06:39 +0000
+++ miral-qt/demos/qml-demo-shell/pointerposition.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef POINTERPOSITION_H
-#define POINTERPOSITION_H
-
-#include <QObject>
-
-class PointerPosition : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int x READ x NOTIFY xChanged)
-    Q_PROPERTY(int y READ y NOTIFY yChanged)
-
-public:
-    static PointerPosition *instance();
-
-    int x() const { return m_x; }
-    int y() const { return m_y; }
-
-Q_SIGNALS:
-    void xChanged();
-    void yChanged();
-
-protected:
-    bool eventFilter(QObject *object, QEvent *event);
-
-private:
-    Q_DISABLE_COPY(PointerPosition)
-    PointerPosition();
-    ~PointerPosition();
-
-    int m_x{0}, m_y{0};
-};
-
-#endif // POINTERPOSITION_H

=== removed file 'miral-qt/demos/qml-demo-shell/qml-demo-shell.qml'
--- miral-qt/demos/qml-demo-shell/qml-demo-shell.qml	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/qml-demo-shell.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-import QtQuick 2.3
-import Unity.Screens 0.1
-
-Instantiator {
-    id: root
-
-    property var screens: Screens{}
-
-    model: screens
-    ScreenWindow {
-        id: window
-        visible: true
-        screen: model.screen
-        Shell{ anchors.fill: parent }
-        Component.onCompleted: {
-            print("Window created for Screen", screen, screen.geometry, outputType, Screens.HDMIA, screen.devicePixelRatio)
-        }
-        Component.onDestruction: {
-            print("Window destroyed")
-        }
-        onScaleChanged: print("NOTICE: scale changed for", model.screen, "to", scale);
-        onFormFactorChanged: print("NOTICE: form factor changed for", model.screen, "to", formFactor)
-        Button {
-            anchors { left: parent.left; bottom: parent.bottom }
-            height: 100
-            width: parent.width / 2
-            text: "Scale up"
-            onClicked: window.setScaleAndFormFactor(window.scale + 0.2, Screens.FormFactorMonitor)
-        }
-        Button {
-            anchors { right: parent.right; bottom: parent.bottom }
-            height: 100
-            width: parent.width / 2
-            text: "Scale down"
-            onClicked: window.setScaleAndFormFactor(window.scale - 0.2, Screens.FormFactorTablet)
-        }
-    }
-}

=== removed file 'miral-qt/demos/qml-demo-shell/qml-demo-shell.qmlproject'
--- miral-qt/demos/qml-demo-shell/qml-demo-shell.qmlproject	2016-06-01 22:06:51 +0000
+++ miral-qt/demos/qml-demo-shell/qml-demo-shell.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator, version 2.7.0 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "qml-demo-shell.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "../src/modules/Unity/Application" ]
-}

=== removed file 'miral-qt/demos/qml-demo-shell/windowModel.qml'
--- miral-qt/demos/qml-demo-shell/windowModel.qml	2016-09-23 17:58:19 +0000
+++ miral-qt/demos/qml-demo-shell/windowModel.qml	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-import QtQuick 2.4
-import Unity.Application 0.1
-import Mir.Pointer 0.1
-
-FocusScope {
-    id: root
-    focus: true
-
-    WindowModel {
-        id: windowModel;
-    }
-
-    Item {
-        id: windowViewContainer
-        anchors.fill: parent
-
-        Repeater {
-            model: windowModel
-
-            delegate: MirSurfaceItem {
-                id: surfaceItem
-                surface: model.surface
-                consumesInput: true // QUESTION: why is this non-default?
-                x: surface.position.x
-                y: surface.position.y
-                width: surface.size.width
-                height: surface.size.height
-                focus: surface.focused
-                visible: surface.visible
-
-                Rectangle {
-                    anchors { top: parent.bottom; right: parent.right }
-                    width: childrenRect.width
-                    height: childrenRect.height
-                    color: surface.focused ? "red" : "lightsteelblue"
-                    opacity: 0.8
-                    Text {
-                        text: surface.position.x + "," + surface.position.y + " " + surface.size.width + "x" + surface.size.height
-                        font.pixelSize: 10
-                    }
-                }
-
-                Rectangle { anchors.fill: parent; z: -1; color: "black"; opacity: 0.3 }
-            }
-        }
-    }
-
-    Button {
-        anchors { right: parent.right; top: parent.top }
-        height: 30
-        width: 80
-        text: "Quit"
-        onClicked: Qt.quit()
-    }
-
-    WindowModelDebugView {
-        anchors { right: parent.right; bottom: parent.bottom }
-        model: windowModel
-    }
-
-    Text {
-        anchors { left: parent.left; bottom: parent.bottom }
-        text: "Move window: Ctrl+click\n
-Resize window: Ctrl+Right click"
-    }
-
-    Rectangle {
-        id: mousePointer
-        color: "black"
-        width: 6
-        height: 10
-        x: PointerPosition.x
-        y: PointerPosition.y
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        hoverEnabled: false
-        property variant window: null
-        property int initialWindowXPosition
-        property int initialWindowYPosition
-        property int initialWindowWidth
-        property int initialWindowHeight
-        property int initialMouseXPosition
-        property int initialMouseYPosition
-        property var action
-
-        function moveWindowBy(window, delta) {
-            window.surface.requestedPosition = Qt.point(initialWindowXPosition + delta.x,
-                                                        initialWindowYPosition + delta.y);
-        }
-        function resizeWindowBy(window, delta) {
-            window.surface.resize(Qt.size(initialWindowWidth + delta.x,
-                                          initialWindowHeight + delta.y))
-        }
-
-        onPressed: {
-            if (mouse.modifiers & Qt.ControlModifier) {
-                window = windowViewContainer.childAt(mouse.x, mouse.y)
-                if (!window) return;
-
-                if (mouse.button == Qt.LeftButton) {
-                    initialWindowXPosition = window.surface.position.x
-                    initialWindowYPosition = window.surface.position.y
-                    action = moveWindowBy
-                } else if (mouse.button == Qt.RightButton) {
-                    initialWindowHeight = window.surface.size.height
-                    initialWindowWidth = window.surface.size.width
-                    action = resizeWindowBy
-                }
-                initialMouseXPosition = mouse.x
-                initialMouseYPosition = mouse.y
-            } else {
-                mouse.accepted = false
-            }
-        }
-
-        onPositionChanged: {
-            if (!window) {
-                mouse.accepted = false
-                return
-            }
-            action(window, Qt.point(mouse.x - initialMouseXPosition, mouse.y - initialMouseYPosition))
-        }
-
-        onReleased: {
-            if (!window) {
-                mouse.accepted = false
-                return
-            }
-            action(window, Qt.point(mouse.x - initialMouseXPosition, mouse.y - initialMouseYPosition))
-            window = null;
-        }
-    }
-}

=== removed directory 'miral-qt/src'
=== removed file 'miral-qt/src/CMakeLists.txt'
--- miral-qt/src/CMakeLists.txt	2016-06-01 22:06:51 +0000
+++ miral-qt/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-add_subdirectory(platforms)
-add_subdirectory(modules)

=== removed directory 'miral-qt/src/common'
=== removed file 'miral-qt/src/common/abstractdbusservicemonitor.cpp'
--- miral-qt/src/common/abstractdbusservicemonitor.cpp	2016-08-16 14:15:26 +0000
+++ miral-qt/src/common/abstractdbusservicemonitor.cpp	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2011-2015 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "abstractdbusservicemonitor.h"
-
-#include <QDBusInterface>
-#include <QDBusServiceWatcher>
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QDBusReply>
-
-// On construction QDBusInterface synchronously introspects the service, which will block the GUI
-// thread if the service is busy. QDBusAbstractInterface does not perform this introspection, so
-// let's subclass that and avoid the blocking scenario.
-class AsyncDBusInterface : public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    AsyncDBusInterface(const QString &service, const QString &path,
-                       const QString &interface, const QDBusConnection &connection,
-                       QObject *parent = 0)
-    : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
-    {}
-    ~AsyncDBusInterface() = default;
-};
-
-AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(const QString &service, const QString &path,
-                                                       const QString &interface, const QDBusConnection &connection,
-                                                       QObject *parent)
-    : QObject(parent)
-    , m_service(service)
-    , m_path(path)
-    , m_interface(interface)
-    , m_busConnection(connection)
-    , m_watcher(new QDBusServiceWatcher(service, m_busConnection))
-    , m_dbusInterface(nullptr)
-{
-    connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);
-    connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);
-
-    // Connect to the service if it's up already
-    QDBusConnectionInterface* sessionBus = m_busConnection.interface();
-    QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);
-    if (reply.isValid() && reply.value()) {
-        createInterface(m_service);
-    }
-}
-
-AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()
-{
-    delete m_watcher;
-    delete m_dbusInterface;
-}
-
-void AbstractDBusServiceMonitor::createInterface(const QString &)
-{
-    if (m_dbusInterface != nullptr) {
-        delete m_dbusInterface;
-        m_dbusInterface = nullptr;
-    }
-
-    m_dbusInterface = new AsyncDBusInterface(m_service, m_path, m_interface, m_busConnection);
-    Q_EMIT serviceAvailableChanged(true);
-}
-
-void AbstractDBusServiceMonitor::destroyInterface(const QString &)
-{
-    if (m_dbusInterface != nullptr) {
-        delete m_dbusInterface;
-        m_dbusInterface = nullptr;
-    }
-
-    Q_EMIT serviceAvailableChanged(false);
-}
-
-QDBusAbstractInterface* AbstractDBusServiceMonitor::dbusInterface() const
-{
-    return m_dbusInterface;
-}
-
-bool AbstractDBusServiceMonitor::serviceAvailable() const
-{
-    return m_dbusInterface != nullptr;
-}
-
-#include "abstractdbusservicemonitor.moc"

=== removed file 'miral-qt/src/common/abstractdbusservicemonitor.h'
--- miral-qt/src/common/abstractdbusservicemonitor.h	2016-06-01 22:06:51 +0000
+++ miral-qt/src/common/abstractdbusservicemonitor.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2011-2015 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ABSTRACTDBUSSERVICEMONITOR_H
-#define ABSTRACTDBUSSERVICEMONITOR_H
-
-#include <QObject>
-#include <QString>
-#include <QDBusConnection>
-
-class QDBusAbstractInterface;
-class QDBusServiceWatcher;
-
-class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
-
-public:
-    explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
-                                        const QDBusConnection &connection = QDBusConnection::sessionBus(),
-                                        QObject *parent = 0);
-    ~AbstractDBusServiceMonitor();
-
-    QDBusAbstractInterface* dbusInterface() const;
-
-    bool serviceAvailable() const;
-
-Q_SIGNALS:
-    void serviceAvailableChanged(bool available);
-
-private Q_SLOTS:
-    void createInterface(const QString &service);
-    void destroyInterface(const QString &service);
-
-protected:
-    const QString m_service;
-    const QString m_path;
-    const QString m_interface;
-    const QDBusConnection m_busConnection;
-    QDBusServiceWatcher* m_watcher;
-    QDBusAbstractInterface* m_dbusInterface;
-};
-
-#endif // ABSTRACTDBUSSERVICEMONITOR_H

=== removed file 'miral-qt/src/common/appnotifier.h'
--- miral-qt/src/common/appnotifier.h	2016-09-21 14:13:53 +0000
+++ miral-qt/src/common/appnotifier.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2016 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef APPNOTIFIER_H
-#define APPNOTIFIER_H
-
-#include <QObject>
-#include "miral/application_info.h"
-
-namespace qtmir {
-
-class AppNotifier : public QObject
-{
-    Q_OBJECT
-
-Q_SIGNALS:
-    void appAdded(const miral::ApplicationInfo &app);
-    void appRemoved(const miral::ApplicationInfo &app);
-    void appCreatedWindow(const miral::ApplicationInfo &app);
-};
-
-} // namespace qtmir
-
-Q_DECLARE_METATYPE(miral::ApplicationInfo)
-
-#endif // APPNOTIFIER_H

=== removed file 'miral-qt/src/common/debughelpers.cpp'
--- miral-qt/src/common/debughelpers.cpp	2016-11-01 19:33:51 +0000
+++ miral-qt/src/common/debughelpers.cpp	1970-01-01 00:00:00 +0000
@@ -1,390 +0,0 @@
-/*
- * Copyright (C) 2013-2015 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "debughelpers.h"
-#include <QTouchEvent>
-
-#include <mir_toolkit/event.h>
-
-// Unity API
-#include <unity/shell/application/ApplicationInfoInterface.h>
-#include <unity/shell/application/Mir.h>
-
-const char *touchPointStateToString(Qt::TouchPointState state)
-{
-    switch (state) {
-    case Qt::TouchPointPressed:
-        return "pressed";
-    case Qt::TouchPointMoved:
-        return "moved";
-    case Qt::TouchPointStationary:
-        return "stationary";
-    case Qt::TouchPointReleased:
-        return "released";
-    default:
-        return "UNKNOWN!";
-    }
-}
-
-QString touchEventToString(const QTouchEvent *ev)
-{
-    QString message;
-
-    switch (ev->type()) {
-    case QEvent::TouchBegin:
-        message.append("TouchBegin ");
-        break;
-    case QEvent::TouchUpdate:
-        message.append("TouchUpdate ");
-        break;
-    case QEvent::TouchEnd:
-        message.append("TouchEnd ");
-        break;
-    case QEvent::TouchCancel:
-        message.append("TouchCancel ");
-        break;
-    default:
-        message.append("TouchUNKNOWN ");
-    }
-
-    for (int i=0; i < ev->touchPoints().size(); ++i) {
-
-        const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
-        message.append(
-            QStringLiteral("(id:%1, state:%2, scenePos:(%3,%4), pos:(%5,%6)) ")
-                .arg(touchPoint.id())
-                .arg(touchPointStateToString(touchPoint.state()))
-                .arg(touchPoint.scenePos().x())
-                .arg(touchPoint.scenePos().y())
-                .arg(touchPoint.pos().x())
-                .arg(touchPoint.pos().y())
-            );
-    }
-
-    return message;
-}
-
-QString mirSurfaceAttribAndValueToString(MirSurfaceAttrib attrib, int value)
-{
-    QString str;
-
-    switch (attrib) {
-    case mir_surface_attrib_type:
-        str = QStringLiteral("type=%1").arg(mirSurfaceTypeToStr(value));
-        break;
-
-    case mir_surface_attrib_state:
-        str = QStringLiteral("state=%1").arg(mirSurfaceStateToStr(value));
-        break;
-
-    case mir_surface_attrib_swapinterval:
-        str = QStringLiteral("swapinterval=%1").arg(value);
-        break;
-
-    case mir_surface_attrib_focus:
-        str = QStringLiteral("focus=%1").arg(mirSurfaceFocusStateToStr(value));
-        break;
-
-    case mir_surface_attrib_dpi:
-        str = QStringLiteral("dpi=%1").arg(value);
-        break;