Merge lp:~gerboland/qtubuntu/xenial-artful-build into lp:qtubuntu

[Gerry Boland]

Support building on Qt5.7 and 5.9 (xenial and artful)

[lp:~gerboland/qtubuntu/xenial-artful-build]

401. By Gerry Boland on 2017-10-11

Support building on Qt5.7 and Qt5.9

402. By Gerry Boland on 2017-10-11

Comparing with 5.8 is clearer

Unmerged revisions

402. By Gerry Boland on 2017-10-11

Comparing with 5.8 is clearer

401. By Gerry Boland on 2017-10-11

Support building on Qt5.7 and Qt5.9

400. By Michał Sawicz on 2017-10-10

Update convert-to-gles.patch

399. By Gerry Boland on 2017-08-25

Merge trunk and fix conflicts

398. By Gerry Boland on 2017-08-03

Remove another ref to papi

397. By Gerry Boland on 2017-08-03

Reduce delta

396. By Gerry Boland on 2017-08-03

Restore basic platform services

395. By Gerry Boland on 2017-08-03

Remove clipboard implementation using content-hub

394. By Gerry Boland on 2017-08-03

Merge papi-cleanup and fix

=== modified file 'debian/control'
--- debian/control	2017-01-10 06:41:48 +0000
+++ debian/control	2017-10-11 12:40:37 +0000
@@ -3,17 +3,14 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libatspi2.0-dev,
-               libcontent-hub-dev (>= 0.2),
-               libegl1-mesa-dev,
+               libegl1-mesa-dev (>= 17.0.2),
                libfontconfig1-dev,
                libfreetype6-dev,
-               libgles2-mesa-dev,
+               libgles2-mesa-dev (>= 17.0.2),
                libglib2.0-dev,
                libinput-dev,
-               libmirclient-dev (>= 0.25.0),
-               libmirclient-debug-extension-dev,
+               libmirclient-dev (>= 0.26.1),
                libmtdev-dev,
-               libubuntu-application-api-dev (>= 2.9.0),
                libudev-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -30,20 +27,18 @@
 Architecture: arm64 armhf
 Multi-Arch: same
 Conflicts: qtubuntu-desktop,
+           qtubuntu-appmenutheme,
 Replaces: qtubuntu (<< 0.52),
           qtubuntu-desktop,
+          qtubuntu-appmenutheme,
 Breaks: ubuntu-touch-session (<< 0.107),
         unity8 (<< 7.85),
 Provides: qtubuntu,
-Depends: ubuntu-application-api3-touch,
-         ${misc:Depends},
+          qtubuntu-appmenutheme
+Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt plugins for Ubuntu Platform API (mobile)
- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
- legacy QPA plugin based on the compatibility layers. It also provides Qt
- bindings for Ubuntu Platform API features that are not exposed through the QPA
- plugins.
+Description: Qt plugins for Mir support on Ubuntu (mobile)
+ QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
  .
  This variant of the package is for Android-based phones and tablets.
 
@@ -51,30 +46,16 @@
 Architecture: any
 Multi-Arch: same
 Conflicts: qtubuntu-android,
+           qtubuntu-appmenutheme,
 Replaces: qtubuntu (<< 0.52),
           qtubuntu-android,
+          qtubuntu-appmenutheme,
 Breaks: unity8 (<< 7.85),
 Provides: qtubuntu,
-Depends: ubuntu-application-api3-desktop,
-         ${misc:Depends},
+          qtubuntu-appmenutheme,
+Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt plugins for Ubuntu Platform API (desktop)
- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
- legacy QPA plugin based on the compatibility layers. It also provides Qt
- bindings for Ubuntu Platform API features that are not exposed through the QPA
- plugins.
+Description: Qt plugins for Mir support on Ubuntu (desktop)
+ QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
  .
  This variant of the package is for GNU-based desktops.
-
-Package: qtubuntu-appmenutheme
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt platform theme for exported application menus
- Appmenutheme enables the export of application menus to a global menu bar.
- It is implemented in a QPA platform theme plugin.
- .
- This package will work for applications designed for Qt5, as well as QML
- applications

=== added file 'debian/gles-patches/blank'
=== removed file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-10-12 09:24:44 +0000
+++ debian/gles-patches/convert-to-gles.patch	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-Index: qtubuntu/debian/control
-===================================================================
---- qtubuntu.orig/debian/control
-+++ qtubuntu/debian/control
-@@ -1,4 +1,4 @@
--Source: qtubuntu
-+Source: qtubuntu-gles
- Priority: optional
- Maintainer: Ubuntu Developers <[e-mail]>
- Build-Depends: debhelper (>= 9),
-@@ -12,11 +12,20 @@ Build-Depends: debhelper (>= 9),
-                libinput-dev,
-                libmirclient-dev (>= 0.13.0),
-                libmtdev-dev,
-+               libqt5gui5-gles,
-+               libqt5quick5-gles,
-+               libqt5quickparticles5-gles,
-+               libqt5quicktest5,
-+               libqt5quickwidgets5-gles,
-+               libqt5sensors5-dev,
-                libubuntu-application-api-dev (>= 2.9.0),
-                libudev-dev,
-                libxkbcommon-dev,
-                libxrender-dev,
-                qtbase5-private-dev,
-+               qtbase5-gles-dev,
-+               qtbase5-private-gles-dev,
-+               qtdeclarative5-dev,
-                quilt,
- # 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
-@@ -26,7 +35,7 @@ Standards-Version: 3.9.6
- Section: libs
- 
- Package: qtubuntu-android
--Architecture: arm64 armhf
-+Architecture: amd64 i386
- Multi-Arch: same
- Conflicts: qtubuntu-desktop,
- Replaces: qtubuntu (<< 0.52),
-@@ -37,43 +46,12 @@ Provides: qtubuntu,
- Depends: ubuntu-application-api3-touch,
-          ${misc:Depends},
-          ${shlibs:Depends},
--Description: Qt plugins for Ubuntu Platform API (mobile)
-+Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
-  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
-  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
-  legacy QPA plugin based on the compatibility layers. It also provides Qt
-  bindings for Ubuntu Platform API features that are not exposed through the QPA
-  plugins.
-  .
-- This variant of the package is for Android-based phones and tablets.
--
--Package: qtubuntu-desktop
--Architecture: any
--Multi-Arch: same
--Conflicts: qtubuntu-android,
--Replaces: qtubuntu (<< 0.52),
--          qtubuntu-android,
--Breaks: unity8 (<< 7.85),
--Provides: qtubuntu,
--Depends: ubuntu-application-api3-desktop,
--         ${misc:Depends},
--         ${shlibs:Depends},
--Description: Qt plugins for Ubuntu Platform API (desktop)
-- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
-- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
-- legacy QPA plugin based on the compatibility layers. It also provides Qt
-- bindings for Ubuntu Platform API features that are not exposed through the QPA
-- plugins.
-- .
-- This variant of the package is for GNU-based desktops.
--
--Package: qtubuntu-appmenutheme
--Architecture: any
--Multi-Arch: same
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Description: Qt platform theme for exported application menus
-- Appmenutheme enables the export of application menus to a global menu bar.
-- It is implemented in a QPA platform theme plugin.
-- .
-- This package will work for applications designed for Qt5, as well as QML
-- applications
-+ This variant of the package is for Android-based phones and tablets (built
-+ against the OpenGLES variant of qtbase).
-Index: qtubuntu/debian/rules
-===================================================================
---- qtubuntu.orig/debian/rules
-+++ qtubuntu/debian/rules
-@@ -5,61 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
- export QT_SELECT=5
- 
- ANDROID_DIR = build-android
--DESKTOP_DIR = build-desktop
- TMP1_DIR = $(CURDIR)/debian/tmp1
--TMP2_DIR = $(CURDIR)/debian/tmp2
- 
--# We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
- DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
- DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
- DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
- 
- export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
- 
--gles2_architectures = arm64 armhf
--
- %:
- 	dh $@
- 
- override_dh_clean:
--ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
--	rm -rf $(TMP1_DIR) $(DESKTOP_DIR)
--endif
--	rm -rf $(TMP2_DIR) $(ANDROID_DIR)
-+	rm -rf $(TMP1_DIR) $(ANDROID_DIR)
- 	dh_clean
- 
- override_dh_auto_configure:
--ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	mkdir -p $(ANDROID_DIR)
-   ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
- 	cd $(ANDROID_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
-   else
- 	dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
-   endif
--endif
--	mkdir -p $(DESKTOP_DIR)
--ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
--	cd $(DESKTOP_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
--else
--	dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
--endif
- 
- override_dh_auto_build:
--ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	dh_auto_build -B$(ANDROID_DIR)
--endif
--	dh_auto_build -B$(DESKTOP_DIR)
- 
- override_dh_auto_install:
- 	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
--ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
--endif
--	mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
- 
- override_dh_install:
--ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- 	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
--endif
--	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
--	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-appmenutheme

=== modified file 'debian/gles-patches/series'
--- debian/gles-patches/series	2016-03-31 22:27:16 +0000
+++ debian/gles-patches/series	2017-10-11 12:40:37 +0000
@@ -1,1 +1,1 @@
-convert-to-gles.patch
+blank

=== removed file 'debian/qtubuntu-appmenutheme.install'
--- debian/qtubuntu-appmenutheme.install	2016-06-17 12:40:26 +0000
+++ debian/qtubuntu-appmenutheme.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/qt5/plugins/platformthemes/*

=== modified file 'debian/rules'
--- debian/rules	2016-06-17 12:40:26 +0000
+++ debian/rules	2017-10-11 12:40:37 +0000
@@ -62,4 +62,3 @@
 	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
 endif
 	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
-	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-appmenutheme

=== modified file 'src/shared/ubuntutheme.h'
--- src/shared/ubuntutheme.h	2017-07-07 08:17:58 +0000
+++ src/shared/ubuntutheme.h	2017-10-11 12:40:37 +0000
@@ -15,7 +15,11 @@
  */
 
 #include <QVariant>
-#include <QtThemeSupport/private/qgenericunixthemes_p.h>
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtThemeSupport/private/qgenericunixthemes_p.h>
+#else
+#  include <QtPlatformSupport/private/qgenericunixthemes_p.h>
+#endif
 
 class UbuntuTheme : public QGenericUnixTheme
 {

=== modified file 'src/src.pro'
--- src/src.pro	2016-06-21 16:33:19 +0000
+++ src/src.pro	2017-10-11 12:40:37 +0000
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += ubuntumirclient ubuntuappmenu
+SUBDIRS += ubuntumirclient

=== removed directory 'src/ubuntuappmenu'
=== removed file 'src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml'
--- src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml	2016-09-29 10:24:29 +0000
+++ src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-        <dox:d><![CDATA[
-          @mainpage
-
-          An interface to register menus that are associated with a window in an application.  The
-          main interface is documented here: @ref com::ubuntu::MenuRegistrar.
-
-          The actual menus are transported using the gmenumodel protocol
-        ]]></dox:d>
-        <interface name="com.ubuntu.MenuRegistrar" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-                <dox:d>
-                  An interface to register a menu from an application to be displayed in another
-                  window.  This manages that association between processes and/or Mir surface IDs and the dbus
-                  address and object that provides the menus using the  org.gtk.Menus interface.
-                </dox:d>
-                <method name="RegisterAppMenu">
-                        <dox:d><![CDATA[
-                          Associates a gmenumodel with an application
-
-                          /note this method assumes that the connection from the caller is the DBus connection
-                            to use for the object.  Applications that use multiple DBus connections will need to
-                            ensure this method is called with the same connection that implements the object.
-                        ]]></dox:d>
-                        <arg name="pid" type="u" direction="in">
-                                <dox:d>The process ID of the application for which the menu is associated</dox:d>
-                        </arg>
-                        <arg name="menuObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path where the gmenumodel interface for the application menu has been exported</dox:d>
-                        </arg>
-                        <arg name="actionObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path where the gactionmenu interface for the application menu actions has been exported</dox:d>
-                        </arg>
-                        <arg name="service" type="s" direction="in">
-                            <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>
-                        </arg>
-                </method>
-                <method name="UnregisterAppMenu">
-                        <dox:d>
-                          A method to allow removing an application menu from the database.
-                        </dox:d>
-                        <arg name="pid" type="u" direction="in">
-                                <dox:d>The process id of the application</dox:d>
-                        </arg>
-                        <arg name="menuObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path for the registered application menu to be unregistered</dox:d>
-                        </arg>
-                </method>
-
-                <method name="RegisterSurfaceMenu">
-                        <dox:d><![CDATA[
-                          Associates a gmenumodel with a surface
-
-                          /note this method assumes that the connection from the caller is the DBus connection
-                            to use for the object.  Applications that use multiple DBus connections will need to
-                            ensure this method is called with the same connection that implements the object.
-                        ]]></dox:d>
-                        <arg name="surface" type="s" direction="in">
-                                <dox:d>The surface ID of the surface</dox:d>
-                        </arg>
-                        <arg name="menuObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path where the gmenumodel interface for the surface menu has been exported</dox:d>
-                        </arg>
-                        <arg name="actionObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path where the gactionmenu interface for the surface menu actions has been exported</dox:d>
-                        </arg>
-                        <arg name="service" type="s" direction="in">
-                            <dox:d>The dbus conection name of the client application to be registered (e.g. :1.23 or org.example.service)</dox:d>
-                        </arg>
-                </method>
-                <method name="UnregisterSurfaceMenu">
-                        <dox:d>
-                          A method to allow removing a surface menu from the database.
-                        </dox:d>
-                        <arg name="surfaceId" type="s" direction="in">
-                                <dox:d>The surface id of the surface</dox:d>
-                        </arg>
-                        <arg name="menuObjectPath" type="o" direction="in">
-                                <dox:d>The dbus path for the registered surface menu to be unregistered</dox:d>
-                        </arg>
-                </method>
-        </interface>
-</node>

=== removed file 'src/ubuntuappmenu/gmenumodelexporter.cpp'
--- src/ubuntuappmenu/gmenumodelexporter.cpp	2017-03-27 08:23:00 +0000
+++ src/ubuntuappmenu/gmenumodelexporter.cpp	1970-01-01 00:00:00 +0000
@@ -1,475 +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/>.
- */
-
-// Local
-#include "gmenumodelexporter.h"
-#include "registry.h"
-#include "logging.h"
-#include "qtubuntuextraactionhandler.h"
-
-#include <QDebug>
-#include <QTimerEvent>
-
-#include <functional>
-
-namespace {
-
-// Derive an action name from the label by removing spaces and Capitilizing the words.
-// Also remove mnemonics from the label.
-inline QString getActionString(QString label)
-{
-    QRegExp re("\\W");
-    label = label.replace(QRegExp("(&|_)"), "");
-    QStringList parts = label.split(re, QString::SkipEmptyParts);
-
-    QString result;
-    Q_FOREACH(const QString& part, parts) {
-        result += part[0].toUpper();
-        result += part.right(part.length()-1);
-    }
-    return result;
-}
-
-static void activate_cb(GSimpleAction *action, GVariant *, gpointer user_data)
-{
-    qCDebug(ubuntuappmenu, "Activate menu action '%s'", g_action_get_name(G_ACTION(action)));
-    auto item = static_cast<UbuntuPlatformMenuItem*>(user_data);
-    item->activated();
-}
-
-static uint s_menuId = 0;
-
-#define MENU_OBJECT_PATH "/com/ubuntu/Menu/%1"
-
-} // namespace
-
-
-UbuntuMenuBarExporter::UbuntuMenuBarExporter(UbuntuPlatformMenuBar * bar)
-    : UbuntuGMenuModelExporter(bar)
-{
-    qCDebug(ubuntuappmenu, "UbuntuMenuBarExporter::UbuntuMenuBarExporter");
-
-    connect(bar, &UbuntuPlatformMenuBar::structureChanged, this, [this]() {
-        m_structureTimer.start();
-    });
-    connect(&m_structureTimer, &QTimer::timeout, this, [this, bar]() {
-        clear();
-        Q_FOREACH(QPlatformMenu *platformMenu, bar->menus()) {
-            GMenuItem* item = createSubmenu(platformMenu, nullptr);
-            if (item) {
-                g_menu_append_item(m_gmainMenu, item);
-                g_object_unref(item);
-            }
-
-            UbuntuPlatformMenu* gplatformMenu = static_cast<UbuntuPlatformMenu*>(platformMenu);
-            if (gplatformMenu) {
-                // Sadly we don't have a better way to propagate a enabled change in a top level menu
-                // than reseting the whole menubar
-                connect(gplatformMenu, &UbuntuPlatformMenu::enabledChanged, bar, &UbuntuPlatformMenuBar::structureChanged);
-            }
-        }
-    });
-
-    connect(bar, &UbuntuPlatformMenuBar::ready, this, [this]() {
-        exportModels();
-    });
-}
-
-UbuntuMenuBarExporter::~UbuntuMenuBarExporter()
-{
-    qCDebug(ubuntuappmenu, "UbuntuMenuBarExporter::~UbuntuMenuBarExporter");
-}
-
-UbuntuMenuExporter::UbuntuMenuExporter(UbuntuPlatformMenu *menu)
-    : UbuntuGMenuModelExporter(menu)
-{
-    qCDebug(ubuntuappmenu, "UbuntuMenuExporter::UbuntuMenuExporter");
-
-    connect(menu, &UbuntuPlatformMenu::structureChanged, this, [this]() {
-        m_structureTimer.start();
-    });
-    connect(&m_structureTimer, &QTimer::timeout, this, [this, menu]() {
-        clear();
-        addSubmenuItems(menu, m_gmainMenu);
-    });
-    addSubmenuItems(menu, m_gmainMenu);
-}
-
-UbuntuMenuExporter::~UbuntuMenuExporter()
-{
-    qCDebug(ubuntuappmenu, "UbuntuMenuExporter::~UbuntuMenuExporter");
-}
-
-UbuntuGMenuModelExporter::UbuntuGMenuModelExporter(QObject *parent)
-    : QObject(parent)
-    , m_connection(nullptr)
-    , m_gmainMenu(g_menu_new())
-    , m_gactionGroup(g_simple_action_group_new())
-    , m_exportedModel(0)
-    , m_exportedActions(0)
-    , m_qtubuntuExtraHandler(nullptr)
-    , m_menuPath(QStringLiteral(MENU_OBJECT_PATH).arg(s_menuId++))
-{
-    m_structureTimer.setSingleShot(true);
-    m_structureTimer.setInterval(0);
-}
-
-UbuntuGMenuModelExporter::~UbuntuGMenuModelExporter()
-{
-    unexportModels();
-    clear();
-
-    g_object_unref(m_gmainMenu);
-    g_object_unref(m_gactionGroup);
-}
-
-// Clear the menu and actions that have been created.
-void UbuntuGMenuModelExporter::clear()
-{
-    Q_FOREACH(const QVector<QMetaObject::Connection>& menuPropertyConnections, m_propertyConnections) {
-        Q_FOREACH(const QMetaObject::Connection& connection, menuPropertyConnections) {
-            QObject::disconnect(connection);
-        }
-    }
-    m_propertyConnections.clear();
-
-    g_menu_remove_all(m_gmainMenu);
-
-    Q_FOREACH(const QSet<QByteArray>& menuActions, m_actions) {
-        Q_FOREACH(const QByteArray& action, menuActions) {
-            g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), action.constData());
-        }
-    }
-    m_actions.clear();
-
-    m_gmenusForMenus.clear();
-}
-
-void UbuntuGMenuModelExporter::timerEvent(QTimerEvent *e)
-{
-    // Find the menu, it's a very short list
-    auto it = m_reloadMenuTimers.begin();
-    for (; it != m_reloadMenuTimers.end(); ++it) {
-        if (e->timerId() == it.value())
-            break;
-    }
-
-    if (it != m_reloadMenuTimers.end()) {
-        UbuntuPlatformMenu* gplatformMenu = it.key();
-        GMenu *menu = m_gmenusForMenus.value(gplatformMenu);
-        if (menu) {
-            Q_FOREACH(const QMetaObject::Connection& connection, m_propertyConnections[menu]) {
-                QObject::disconnect(connection);
-            }
-            m_propertyConnections.remove(menu);
-            Q_FOREACH(const QByteArray& action, m_actions[menu]) {
-                g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), action.constData());
-            }
-            m_actions.remove(menu);
-            g_menu_remove_all(menu);
-            addSubmenuItems(gplatformMenu, menu);
-        } else {
-            qWarning() << "Got an update timer for a menu that has no GMenu" << gplatformMenu;
-        }
-
-        m_reloadMenuTimers.erase(it);
-    } else {
-        qWarning() << "Got an update timer for a timer that was not running";
-    }
-    killTimer(e->timerId());
-}
-
-// Export the model on dbus
-void UbuntuGMenuModelExporter::exportModels()
-{
-    GError *error = nullptr;
-    m_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, nullptr, &error);
-    if (!m_connection) {
-        qCWarning(ubuntuappmenu, "Failed to retreive session bus - %s", error ? error->message : "unknown error");
-        g_error_free (error);
-        return;
-    }
-
-    QByteArray menuPath(m_menuPath.toUtf8());
-
-    if (m_exportedModel == 0) {
-        m_exportedModel = g_dbus_connection_export_menu_model(m_connection, menuPath.constData(), G_MENU_MODEL(m_gmainMenu), &error);
-        if (m_exportedModel == 0) {
-            qCWarning(ubuntuappmenu, "Failed to export menu - %s", error ? error->message : "unknown error");
-            g_error_free (error);
-            error = nullptr;
-        } else {
-            qCDebug(ubuntuappmenu, "Exported menu on %s", g_dbus_connection_get_unique_name(m_connection));
-        }
-    }
-
-    if (m_exportedActions == 0) {
-        m_exportedActions = g_dbus_connection_export_action_group(m_connection, menuPath.constData(), G_ACTION_GROUP(m_gactionGroup), &error);
-        if (m_exportedActions == 0) {
-            qCWarning(ubuntuappmenu, "Failed to export actions - %s", error ? error->message : "unknown error");
-            g_error_free (error);
-            error = nullptr;
-        } else {
-            qCDebug(ubuntuappmenu, "Exported actions on %s", g_dbus_connection_get_unique_name(m_connection));
-        }
-    }
-
-    if (!m_qtubuntuExtraHandler) {
-        m_qtubuntuExtraHandler = new QtUbuntuExtraActionHandler();
-        if (!m_qtubuntuExtraHandler->connect(m_connection, menuPath, this)) {
-            delete m_qtubuntuExtraHandler;
-            m_qtubuntuExtraHandler = nullptr;
-        }
-    }
-}
-
-void UbuntuGMenuModelExporter::aboutToShow(quint64 tag)
-{
-    UbuntuPlatformMenu* gplatformMenu = m_submenusWithTag.value(tag);
-    if (!gplatformMenu) {
-        qWarning() << "Got an aboutToShow call with an unknown tag";
-        return;
-    }
-
-    gplatformMenu->aboutToShow();
-}
-
-// Unexport the model
-void UbuntuGMenuModelExporter::unexportModels()
-{
-    GError *error = nullptr;
-    if (!m_connection) {
-        qCWarning(ubuntuappmenu, "Failed to retreive session bus - %s", error ? error->message : "unknown error");
-        return;
-    }
-
-    if (m_exportedModel != 0) {
-        g_dbus_connection_unexport_menu_model(m_connection, m_exportedModel);
-        m_exportedModel = 0;
-    }
-    if (m_exportedActions != 0) {
-        g_dbus_connection_unexport_action_group(m_connection, m_exportedActions);
-        m_exportedActions = 0;
-    }
-    if (m_qtubuntuExtraHandler) {
-        m_qtubuntuExtraHandler->disconnect(m_connection);
-        delete m_qtubuntuExtraHandler;
-        m_qtubuntuExtraHandler = nullptr;
-    }
-    g_object_unref(m_connection);
-    m_connection = nullptr;
-}
-
-// Create a submenu for the given platform menu.
-// Returns a gmenuitem entry for the menu, which must be cleaned up using g_object_unref.
-// If forItem is suplied, use it's label.
-GMenuItem *UbuntuGMenuModelExporter::createSubmenu(QPlatformMenu *platformMenu, UbuntuPlatformMenuItem *forItem)
-{
-    UbuntuPlatformMenu* gplatformMenu = static_cast<UbuntuPlatformMenu*>(platformMenu);
-    if (!gplatformMenu) return nullptr;
-    GMenu* menu = g_menu_new();
-
-    m_gmenusForMenus.insert(gplatformMenu, menu);
-
-    QByteArray label;
-    bool enabled;
-    if (forItem) {
-        label = UbuntuPlatformMenuItem::get_text(forItem).toUtf8();
-        enabled = UbuntuPlatformMenuItem::get_enabled(forItem);
-    } else {
-        label = UbuntuPlatformMenu::get_text(gplatformMenu).toUtf8();
-        enabled = UbuntuPlatformMenu::get_enabled(gplatformMenu);
-    }
-
-    addSubmenuItems(gplatformMenu, menu);
-
-    Q_FOREACH(QPlatformMenuItem *childItem, gplatformMenu->menuItems()) {
-        UbuntuPlatformMenuItem* gplatformMenuItem = static_cast<UbuntuPlatformMenuItem*>(childItem);
-        if (!gplatformMenuItem) continue;
-
-        // Sadly we don't have a better way to propagate a enabled change in a item-that-is-submenu
-        // than reseting the whole parent menu
-        if (gplatformMenuItem->menu()) {
-            connect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, gplatformMenu, &UbuntuPlatformMenu::structureChanged);
-        }
-        connect(gplatformMenuItem, &UbuntuPlatformMenuItem::visibleChanged, gplatformMenu, &UbuntuPlatformMenu::structureChanged);
-    }
-
-    GMenuItem* gmenuItem = g_menu_item_new_submenu(label.constData(), G_MENU_MODEL(menu));
-    const quint64 tag = gplatformMenu->tag();
-    if (tag != 0) {
-        g_menu_item_set_attribute_value(gmenuItem, "qtubuntu-tag", g_variant_new_uint64 (tag));
-        m_submenusWithTag.insert(gplatformMenu->tag(), gplatformMenu);
-    }
-    g_object_unref(menu);
-
-    g_menu_item_set_attribute_value(gmenuItem, "submenu-enabled", g_variant_new_boolean(enabled));
-
-    connect(gplatformMenu, &UbuntuPlatformMenu::structureChanged, this, [this, gplatformMenu]
-        {
-            if (!m_reloadMenuTimers.contains(gplatformMenu)) {
-                const int timerId = startTimer(0);
-                m_reloadMenuTimers.insert(gplatformMenu, timerId);
-            }
-        });
-
-    connect(gplatformMenu, &UbuntuPlatformMenu::destroyed, this, [this, tag, gplatformMenu]
-        {
-            m_submenusWithTag.remove(tag);
-            m_gmenusForMenus.remove(gplatformMenu);
-            auto timerIdIt = m_reloadMenuTimers.find(gplatformMenu);
-            if (timerIdIt != m_reloadMenuTimers.end()) {
-                killTimer(*timerIdIt);
-                m_reloadMenuTimers.erase(timerIdIt);
-            }
-        });
-
-    return gmenuItem;
-}
-
-// Add a platform menu's items to the given gmenu.
-// The items are inserted into menus sections, split by the menu separators.
-void UbuntuGMenuModelExporter::addSubmenuItems(UbuntuPlatformMenu* gplatformMenu, GMenu* menu)
-{
-    auto iter = gplatformMenu->menuItems().begin();
-    auto lastSectionStart = iter;
-    // Iterate through all the menu items adding sections when a separator is found.
-    for (; iter != gplatformMenu->menuItems().end(); ++iter) {
-        UbuntuPlatformMenuItem* gplatformMenuItem = static_cast<UbuntuPlatformMenuItem*>(*iter);
-        if (!gplatformMenuItem) continue;
-
-        // don't add a section until we have separator
-        if (UbuntuPlatformMenuItem::get_separator(gplatformMenuItem)) {
-            if (lastSectionStart != gplatformMenu->menuItems().begin()) {
-                GMenuItem* section = createSection(lastSectionStart, iter);
-                g_menu_append_item(menu, section);
-                g_object_unref(section);
-            }
-            lastSectionStart = iter + 1;
-        } else if (lastSectionStart == gplatformMenu->menuItems().begin()) {
-            processItemForGMenu(gplatformMenuItem, menu);
-        }
-    }
-
-    // Add the last section
-    if (lastSectionStart != gplatformMenu->menuItems().begin() &&
-            lastSectionStart != gplatformMenu->menuItems().end()) {
-        GMenuItem* gsectionItem = createSection(lastSectionStart, gplatformMenu->menuItems().end());
-        g_menu_append_item(menu, gsectionItem);
-        g_object_unref(gsectionItem);
-    }
-}
-
-// Create and return a gmenu item for the given platform menu item.
-// Returned GMenuItem must be cleaned up using g_object_unref
-GMenuItem *UbuntuGMenuModelExporter::createMenuItem(QPlatformMenuItem *platformMenuItem, GMenu *parentMenu)
-{
-    UbuntuPlatformMenuItem* gplatformMenuItem = static_cast<UbuntuPlatformMenuItem*>(platformMenuItem);
-    if (!gplatformMenuItem) return nullptr;
-
-    if (!UbuntuPlatformMenuItem::get_visible(gplatformMenuItem))
-        return nullptr;
-
-    QByteArray label(UbuntuPlatformMenuItem::get_text(gplatformMenuItem).toUtf8());
-    QByteArray actionLabel(getActionString(UbuntuPlatformMenuItem::get_text(gplatformMenuItem)).toUtf8());
-    QByteArray shortcut(UbuntuPlatformMenuItem::get_shortcut(gplatformMenuItem).toString(QKeySequence::NativeText).toUtf8());
-
-    GMenuItem* gmenuItem = g_menu_item_new(label.constData(), nullptr);
-    g_menu_item_set_attribute(gmenuItem, "accel", "s", shortcut.constData());
-    g_menu_item_set_detailed_action(gmenuItem, ("unity." + actionLabel).constData());
-
-    addAction(actionLabel, gplatformMenuItem, parentMenu);
-    return gmenuItem;
-}
-
-// Create a menu section for a section of separated menu items.
-// Returned GMenuItem must be cleaned up using g_object_unref
-GMenuItem *UbuntuGMenuModelExporter::createSection(QList<QPlatformMenuItem *>::const_iterator iter, QList<QPlatformMenuItem *>::const_iterator end)
-{
-    GMenu* gsectionMenu = g_menu_new();
-    for (; iter != end; ++iter) {
-        processItemForGMenu(*iter, gsectionMenu);
-    }
-    GMenuItem* gsectionItem = g_menu_item_new_section("", G_MENU_MODEL(gsectionMenu));
-    g_object_unref(gsectionMenu);
-    return gsectionItem;
-}
-
-// Add the given platform menu item to the menu.
-// If it has an attached submenu, then create and add the submenu.
-void UbuntuGMenuModelExporter::processItemForGMenu(QPlatformMenuItem *platformMenuItem, GMenu *gmenu)
-{
-    UbuntuPlatformMenuItem* gplatformMenuItem = static_cast<UbuntuPlatformMenuItem*>(platformMenuItem);
-    if (!gplatformMenuItem) return;
-
-    GMenuItem* gmenuItem = gplatformMenuItem->menu() ? createSubmenu(gplatformMenuItem->menu(), gplatformMenuItem) :
-                                                       createMenuItem(gplatformMenuItem, gmenu);
-    if (gmenuItem) {
-        g_menu_append_item(gmenu, gmenuItem);
-        g_object_unref(gmenuItem);
-    }
-}
-
-// Create and add an action for a menu item.
-void UbuntuGMenuModelExporter::addAction(const QByteArray &name, UbuntuPlatformMenuItem *gplatformMenuItem, GMenu *parentMenu)
-{
-    disconnect(gplatformMenuItem, &UbuntuPlatformMenuItem::checkedChanged, this, 0);
-    disconnect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, this, 0);
-
-    QSet<QByteArray> &actions = m_actions[parentMenu];
-    QVector<QMetaObject::Connection> &propertyConnections = m_propertyConnections[parentMenu];
-
-    if (actions.contains(name)) {
-        g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), name.constData());
-        actions.remove(name);
-    }
-
-    bool checkable = UbuntuPlatformMenuItem::get_checkable(gplatformMenuItem);
-
-    GSimpleAction* action = nullptr;
-    if (checkable) {
-        bool checked = UbuntuPlatformMenuItem::get_checked(gplatformMenuItem);
-        action = g_simple_action_new_stateful(name.constData(), nullptr, g_variant_new_boolean(checked));
-
-        std::function<void(bool)> updateChecked = [gplatformMenuItem, action](bool checked) {
-            auto type = g_action_get_state_type(G_ACTION(action));
-            if (type && g_variant_type_equal(type, G_VARIANT_TYPE_BOOLEAN)) {
-                g_simple_action_set_state(action, g_variant_new_boolean(checked ? TRUE : FALSE));
-            }
-        };
-        // save the connection to disconnect in UbuntuGMenuModelExporter::clear()
-        propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::checkedChanged, this, updateChecked);
-    } else {
-        action = g_simple_action_new(name.constData(), nullptr);
-    }
-
-    // Enabled update
-    std::function<void(bool)> updateEnabled = [gplatformMenuItem, action](bool enabled) {
-        GValue value = G_VALUE_INIT;
-        g_value_init (&value, G_TYPE_BOOLEAN);
-        g_value_set_boolean(&value, enabled ? TRUE : FALSE);
-        g_object_set_property(G_OBJECT(action), "enabled", &value);
-    };
-    updateEnabled(UbuntuPlatformMenuItem::get_enabled(gplatformMenuItem));
-    // save the connection to disconnect in UbuntuGMenuModelExporter::clear()
-    propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, this, updateEnabled);
-
-    g_signal_connect(action, "activate", G_CALLBACK(activate_cb), gplatformMenuItem);
-
-    actions.insert(name);
-    g_action_map_add_action(G_ACTION_MAP(m_gactionGroup), G_ACTION(action));
-    g_object_unref(action);
-}

=== removed file 'src/ubuntuappmenu/gmenumodelexporter.h'
--- src/ubuntuappmenu/gmenumodelexporter.h	2017-03-15 08:47:51 +0000
+++ src/ubuntuappmenu/gmenumodelexporter.h	1970-01-01 00:00:00 +0000
@@ -1,100 +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 GMENUMODELEXPORTER_H
-#define GMENUMODELEXPORTER_H
-
-#include "gmenumodelplatformmenu.h"
-
-#include <gio/gio.h>
-
-#include <QTimer>
-#include <QMap>
-#include <QSet>
-#include <QMetaObject>
-
-class QtUbuntuExtraActionHandler;
-
-// Base class for a gmenumodel exporter
-class UbuntuGMenuModelExporter : public QObject
-{
-    Q_OBJECT
-public:
-    virtual ~UbuntuGMenuModelExporter();
-
-    void exportModels();
-    void unexportModels();
-
-    QString menuPath() const { return m_menuPath;}
-
-    void aboutToShow(quint64 tag);
-
-protected:
-    UbuntuGMenuModelExporter(QObject *parent);
-
-    GMenuItem *createSubmenu(QPlatformMenu* platformMenu, UbuntuPlatformMenuItem* forItem);
-    GMenuItem *createMenuItem(QPlatformMenuItem* platformMenuItem, GMenu *parentMenu);
-    GMenuItem *createSection(QList<QPlatformMenuItem*>::const_iterator iter, QList<QPlatformMenuItem*>::const_iterator end);
-    void addAction(const QByteArray& name, UbuntuPlatformMenuItem* gplatformItem, GMenu *parentMenu);
-
-    void addSubmenuItems(UbuntuPlatformMenu* gplatformMenu, GMenu* menu);
-    void processItemForGMenu(QPlatformMenuItem* item, GMenu* gmenu);
-
-    void clear();
-
-    void timerEvent(QTimerEvent *e) override;
-
-protected:
-    GDBusConnection *m_connection;
-    GMenu *m_gmainMenu;
-    GSimpleActionGroup *m_gactionGroup;
-    guint m_exportedModel;
-    guint m_exportedActions;
-    QtUbuntuExtraActionHandler *m_qtubuntuExtraHandler;
-    QTimer m_structureTimer;
-    QString m_menuPath;
-
-    // UbuntuPlatformMenu::tag -> UbuntuPlatformMenu
-    QMap<quint64, UbuntuPlatformMenu*> m_submenusWithTag;
-
-    // UbuntuPlatformMenu -> reload TimerId (startTimer)
-    QHash<UbuntuPlatformMenu*, int> m_reloadMenuTimers;
-
-    QHash<UbuntuPlatformMenu*, GMenu*> m_gmenusForMenus;
-
-    QHash<GMenu*, QSet<QByteArray>> m_actions;
-    QHash<GMenu*, QVector<QMetaObject::Connection>> m_propertyConnections;
-
-};
-
-// Class which exports a qt platform menu bar.
-class UbuntuMenuBarExporter : public UbuntuGMenuModelExporter
-{
-public:
-    UbuntuMenuBarExporter(UbuntuPlatformMenuBar *parent);
-    ~UbuntuMenuBarExporter();
-};
-
-// Class which exports a qt platform menu.
-// This will allow exporting of context menus.
-class UbuntuMenuExporter : public UbuntuGMenuModelExporter
-{
-public:
-    UbuntuMenuExporter(UbuntuPlatformMenu *parent);
-    ~UbuntuMenuExporter();
-};
-
-#endif // GMENUMODELEXPORTER_H

=== removed file 'src/ubuntuappmenu/gmenumodelplatformmenu.cpp'
--- src/ubuntuappmenu/gmenumodelplatformmenu.cpp	2017-03-27 08:23:00 +0000
+++ src/ubuntuappmenu/gmenumodelplatformmenu.cpp	1970-01-01 00:00:00 +0000
@@ -1,518 +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/>.
- */
-
-// Local
-#include "gmenumodelplatformmenu.h"
-#include "gmenumodelexporter.h"
-#include "registry.h"
-#include "menuregistrar.h"
-#include "logging.h"
-
-// Qt
-#include <QDebug>
-#include <QWindow>
-#include <QCoreApplication>
-
-#define BAR_DEBUG_MSG qCDebug(ubuntuappmenu).nospace() << "UbuntuPlatformMenuBar[" << (void*)this <<"]::" << __func__
-#define MENU_DEBUG_MSG qCDebug(ubuntuappmenu).nospace() << "UbuntuPlatformMenu[" << (void*)this <<"]::" << __func__
-#define ITEM_DEBUG_MSG qCDebug(ubuntuappmenu).nospace() << "UbuntuPlatformMenuItem[" << (void*)this <<"]::" << __func__
-
-namespace {
-
-int logRecusion = 0;
-
-}
-
-QDebug operator<<(QDebug stream, UbuntuPlatformMenuBar* bar) {
-    if (bar) return bar->operator<<(stream);
-    return stream;
-}
-QDebug operator<<(QDebug stream, UbuntuPlatformMenu* menu) {
-    if (menu) return menu->operator<<(stream);
-    return stream;
-}
-QDebug operator<<(QDebug stream, UbuntuPlatformMenuItem* menuItem) {
-    if (menuItem) return menuItem->operator<<(stream);
-    return stream;
-}
-
-UbuntuPlatformMenuBar::UbuntuPlatformMenuBar()
-    : m_exporter(new UbuntuMenuBarExporter(this))
-    , m_registrar(new UbuntuMenuRegistrar())
-    , m_ready(false)
-{
-    BAR_DEBUG_MSG << "()";
-
-    connect(this, &UbuntuPlatformMenuBar::menuInserted, this, &UbuntuPlatformMenuBar::structureChanged);
-    connect(this,&UbuntuPlatformMenuBar::menuRemoved, this, &UbuntuPlatformMenuBar::structureChanged);
-}
-
-UbuntuPlatformMenuBar::~UbuntuPlatformMenuBar()
-{
-    BAR_DEBUG_MSG << "()";
-}
-
-void UbuntuPlatformMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before)
-{
-    BAR_DEBUG_MSG << "(menu=" << menu << ", before=" <<  before << ")";
-
-    if (m_menus.contains(menu)) return;
-
-    if (!before) {
-        m_menus.push_back(menu);
-    } else {
-        for (auto iter = m_menus.begin(); iter != m_menus.end(); ++iter) {
-            if (*iter == before) {
-                m_menus.insert(iter, menu);
-                break;
-            }
-        }
-    }
-    Q_EMIT menuInserted(menu);
-}
-
-void UbuntuPlatformMenuBar::removeMenu(QPlatformMenu *menu)
-{
-    BAR_DEBUG_MSG << "(menu=" << menu << ")";
-
-    QMutableListIterator<QPlatformMenu*> iterator(m_menus);
-    while(iterator.hasNext()) {
-        if (iterator.next() == menu) {
-            iterator.remove();
-            break;
-        }
-    }
-    Q_EMIT menuRemoved(menu);
-}
-
-void UbuntuPlatformMenuBar::syncMenu(QPlatformMenu *menu)
-{
-    BAR_DEBUG_MSG << "(menu=" << menu << ")";
-
-    Q_UNUSED(menu)
-}
-
-void UbuntuPlatformMenuBar::handleReparent(QWindow *parentWindow)
-{
-    BAR_DEBUG_MSG << "(parentWindow=" << parentWindow << ")";
-
-    setReady(true);
-    m_registrar->registerMenuForWindow(parentWindow, QDBusObjectPath(m_exporter->menuPath()));
-}
-
-QPlatformMenu *UbuntuPlatformMenuBar::menuForTag(quintptr tag) const
-{
-    Q_FOREACH(QPlatformMenu* menu, m_menus) {
-        if (menu->tag() == tag) {
-            return menu;
-        }
-    }
-    return nullptr;
-}
-
-const QList<QPlatformMenu *> UbuntuPlatformMenuBar::menus() const
-{
-    return m_menus;
-}
-
-QDebug UbuntuPlatformMenuBar::operator<<(QDebug stream)
-{
-    stream.nospace().noquote() << QString("%1").arg("", logRecusion, QLatin1Char('\t'))
-            << "UbuntuPlatformMenuBar(this=" << (void*)this << ")" << endl;
-    Q_FOREACH(QPlatformMenu* menu, m_menus) {
-        auto myMenu = static_cast<UbuntuPlatformMenu*>(menu);
-        if (myMenu) {
-            logRecusion++;
-            stream << myMenu;
-            logRecusion--;
-        }
-    }
-
-    return stream;
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-QPlatformMenu *UbuntuPlatformMenuBar::createMenu() const
-{
-    return new UbuntuPlatformMenu();
-}
-#endif
-
-void UbuntuPlatformMenuBar::setReady(bool isReady)
-{
-    if (m_ready != isReady) {
-        m_ready = isReady;
-        Q_EMIT ready();
-    }
-}
-
-//////////////////////////////////////////////////////////////
-
-UbuntuPlatformMenu::UbuntuPlatformMenu()
-    : m_tag(reinterpret_cast<quintptr>(this))
-    , m_parentWindow(nullptr)
-    , m_exporter(nullptr)
-    , m_registrar(nullptr)
-{
-    MENU_DEBUG_MSG << "()";
-
-    connect(this, &UbuntuPlatformMenu::menuItemInserted, this, &UbuntuPlatformMenu::structureChanged);
-    connect(this, &UbuntuPlatformMenu::menuItemRemoved, this, &UbuntuPlatformMenu::structureChanged);
-}
-
-UbuntuPlatformMenu::~UbuntuPlatformMenu()
-{
-    MENU_DEBUG_MSG << "()";
-}
-
-void UbuntuPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
-{
-    MENU_DEBUG_MSG << "(menuItem=" << menuItem << ", before=" << before << ")";
-
-    if (m_menuItems.contains(menuItem)) return;
-
-    if (!before) {
-        m_menuItems.push_back(menuItem);
-    } else {
-        for (auto iter = m_menuItems.begin(); iter != m_menuItems.end(); ++iter) {
-            if (*iter == before) {
-                m_menuItems.insert(iter, menuItem);
-                break;
-            }
-        }
-    }
-
-    Q_EMIT menuItemInserted(menuItem);
-}
-
-void UbuntuPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem)
-{
-    MENU_DEBUG_MSG << "(menuItem=" << menuItem << ")";
-
-    QMutableListIterator<QPlatformMenuItem*> iterator(m_menuItems);
-    while(iterator.hasNext()) {
-        if (iterator.next() == menuItem) {
-            iterator.remove();
-            break;
-        }
-    }
-    Q_EMIT menuItemRemoved(menuItem);
-}
-
-void UbuntuPlatformMenu::syncMenuItem(QPlatformMenuItem *menuItem)
-{
-    MENU_DEBUG_MSG << "(menuItem=" << menuItem << ")";
-
-    Q_UNUSED(menuItem)
-}
-
-void UbuntuPlatformMenu::syncSeparatorsCollapsible(bool enable)
-{
-    MENU_DEBUG_MSG << "(enable=" << enable << ")";
-    Q_UNUSED(enable)
-}
-
-void UbuntuPlatformMenu::setTag(quintptr tag)
-{
-    MENU_DEBUG_MSG << "(tag=" << tag << ")";
-    m_tag = tag;
-}
-
-quintptr UbuntuPlatformMenu::tag() const
-{
-    return m_tag;
-}
-
-void UbuntuPlatformMenu::setText(const QString &text)
-{
-    MENU_DEBUG_MSG << "(text=" << text << ")";
-    if (m_text != text) {
-        m_text = text;
-    }
-}
-
-void UbuntuPlatformMenu::setIcon(const QIcon &icon)
-{
-    MENU_DEBUG_MSG << "(icon=" << icon.name() << ")";
-
-    if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {
-        m_icon = icon;
-    }
-}
-
-void UbuntuPlatformMenu::setEnabled(bool enabled)
-{
-    MENU_DEBUG_MSG << "(enabled=" << enabled << ")";
-
-    if (m_enabled != enabled) {
-        m_enabled = enabled;
-        Q_EMIT enabledChanged(enabled);
-    }
-}
-
-void UbuntuPlatformMenu::setVisible(bool isVisible)
-{
-    MENU_DEBUG_MSG << "(visible=" << isVisible << ")";
-
-    if (m_visible != isVisible) {
-        m_visible = isVisible;
-    }
-}
-
-void UbuntuPlatformMenu::setMinimumWidth(int width)
-{
-    MENU_DEBUG_MSG << "(width=" << width << ")";
-
-    Q_UNUSED(width)
-}
-
-void UbuntuPlatformMenu::setFont(const QFont &font)
-{
-    MENU_DEBUG_MSG << "(font=" << font << ")";
-
-    Q_UNUSED(font)
-}
-
-void UbuntuPlatformMenu::showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item)
-{
-    MENU_DEBUG_MSG << "(parentWindow=" << parentWindow << ", targetRect=" << targetRect << ", item=" << item << ")";
-
-    if (!m_exporter) {
-        m_exporter.reset(new UbuntuMenuExporter(this));
-        m_exporter->exportModels();
-    }
-
-    if (parentWindow != m_parentWindow) {
-        if (m_parentWindow) {
-            m_registrar->unregisterMenu();
-        }
-
-        m_parentWindow = parentWindow;
-
-        if (m_parentWindow) {
-            if (!m_registrar) m_registrar.reset(new UbuntuMenuRegistrar);
-            m_registrar->registerMenuForWindow(const_cast<QWindow*>(m_parentWindow),
-                                                      QDBusObjectPath(m_exporter->menuPath()));
-        }
-    }
-
-    Q_UNUSED(targetRect);
-    Q_UNUSED(item);
-    setVisible(true);
-}
-
-void UbuntuPlatformMenu::dismiss()
-{
-    MENU_DEBUG_MSG << "()";
-
-    if (m_registrar) { m_registrar->unregisterMenu(); }
-    if (m_exporter) { m_exporter->unexportModels(); }
-}
-
-QPlatformMenuItem *UbuntuPlatformMenu::menuItemAt(int position) const
-{
-    if (position < 0 || position >= m_menuItems.count()) return nullptr;
-    return m_menuItems.at(position);
-}
-
-QPlatformMenuItem *UbuntuPlatformMenu::menuItemForTag(quintptr tag) const
-{
-    Q_FOREACH(QPlatformMenuItem* menuItem, m_menuItems) {
-        if (menuItem->tag() == tag) {
-            return menuItem;
-        }
-    }
-    return nullptr;
-}
-
-QPlatformMenuItem *UbuntuPlatformMenu::createMenuItem() const
-{
-    return new UbuntuPlatformMenuItem();
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-QPlatformMenu *UbuntuPlatformMenu::createSubMenu() const
-{
-    return new UbuntuPlatformMenu();
-}
-#endif
-
-const QList<QPlatformMenuItem *> UbuntuPlatformMenu::menuItems() const
-{
-    return m_menuItems;
-}
-
-QDebug UbuntuPlatformMenu::operator<<(QDebug stream)
-{
-    stream.nospace().noquote() << QString("%1").arg("", logRecusion, QLatin1Char('\t'))
-            << "UbuntuPlatformMenu(this=" << (void*)this << ", text=\"" << m_text << "\")" << endl;
-    Q_FOREACH(QPlatformMenuItem* item, m_menuItems) {
-        logRecusion++;
-        auto myItem = static_cast<UbuntuPlatformMenuItem*>(item);
-        if (myItem) {
-            stream << myItem;
-        }
-        logRecusion--;
-    }
-    return stream;
-}
-
-//////////////////////////////////////////////////////////////
-
-UbuntuPlatformMenuItem::UbuntuPlatformMenuItem()
-    : m_menu(nullptr)
-    , m_tag(reinterpret_cast<quintptr>(this))
-{
-    ITEM_DEBUG_MSG << "()";
-}
-
-UbuntuPlatformMenuItem::~UbuntuPlatformMenuItem()
-{
-    ITEM_DEBUG_MSG << "()";
-}
-
-void UbuntuPlatformMenuItem::setTag(quintptr tag)
-{
-    ITEM_DEBUG_MSG << "(tag=" << tag << ")";
-    m_tag = tag;
-}
-
-quintptr UbuntuPlatformMenuItem::tag() const
-{
-    return m_tag;
-}
-
-void UbuntuPlatformMenuItem::setText(const QString &text)
-{
-    ITEM_DEBUG_MSG << "(text=" << text << ")";
-    if (m_text != text) {
-        m_text = text;
-    }
-}
-
-void UbuntuPlatformMenuItem::setIcon(const QIcon &icon)
-{
-    ITEM_DEBUG_MSG << "(icon=" << icon.name() << ")";
-
-    if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {
-        m_icon = icon;
-    }
-}
-
-void UbuntuPlatformMenuItem::setVisible(bool isVisible)
-{
-    ITEM_DEBUG_MSG << "(visible=" << isVisible << ")";
-    if (m_visible != isVisible) {
-        m_visible = isVisible;
-        Q_EMIT visibleChanged(m_visible);
-    }
-}
-
-void UbuntuPlatformMenuItem::setIsSeparator(bool isSeparator)
-{
-    ITEM_DEBUG_MSG << "(separator=" << isSeparator << ")";
-    if (m_separator != isSeparator) {
-        m_separator = isSeparator;
-    }
-}
-
-void UbuntuPlatformMenuItem::setFont(const QFont &font)
-{
-    ITEM_DEBUG_MSG << "(font=" << font << ")";
-    Q_UNUSED(font);
-}
-
-void UbuntuPlatformMenuItem::setRole(QPlatformMenuItem::MenuRole role)
-{
-    ITEM_DEBUG_MSG << "(role=" << role << ")";
-    Q_UNUSED(role);
-}
-
-void UbuntuPlatformMenuItem::setCheckable(bool checkable)
-{
-    ITEM_DEBUG_MSG << "(checkable=" << checkable << ")";
-    if (m_checkable != checkable) {
-        m_checkable = checkable;
-    }
-}
-
-void UbuntuPlatformMenuItem::setChecked(bool isChecked)
-{
-    ITEM_DEBUG_MSG << "(checked=" << isChecked << ")";
-    if (m_checked != isChecked) {
-        m_checked = isChecked;
-        Q_EMIT checkedChanged(isChecked);
-    }
-}
-
-void UbuntuPlatformMenuItem::setShortcut(const QKeySequence &shortcut)
-{
-    ITEM_DEBUG_MSG << "(shortcut=" << shortcut << ")";
-    if (m_shortcut != shortcut) {
-        m_shortcut = shortcut;
-    }
-}
-
-void UbuntuPlatformMenuItem::setEnabled(bool enabled)
-{
-    ITEM_DEBUG_MSG << "(enabled=" << enabled << ")";
-    if (m_enabled != enabled) {
-        m_enabled = enabled;
-        Q_EMIT enabledChanged(enabled);
-    }
-}
-
-void UbuntuPlatformMenuItem::setIconSize(int size)
-{
-    ITEM_DEBUG_MSG << "(size=" << size << ")";
-    Q_UNUSED(size);
-}
-
-void UbuntuPlatformMenuItem::setMenu(QPlatformMenu *menu)
-{
-    ITEM_DEBUG_MSG << "(menu=" << menu << ")";
-    if (m_menu != menu) {
-        m_menu = menu;
-
-        if (menu) {
-            connect(menu, &QObject::destroyed,
-                    this, [this] { setMenu(nullptr); });
-        }
-    }
-}
-
-QPlatformMenu *UbuntuPlatformMenuItem::menu() const
-{
-    return m_menu;
-}
-
-QDebug UbuntuPlatformMenuItem::operator<<(QDebug stream)
-{
-    QString properties = "text=\"" + m_text + "\"";
-
-    stream.nospace().noquote() << QString("%1").arg("", logRecusion, QLatin1Char('\t'))
-            << "UbuntuPlatformMenuItem(this=" << (void*)this << ", "
-            << (m_separator ? "Separator" : properties) << ")" << endl;
-    if (m_menu) {
-        auto myMenu = static_cast<UbuntuPlatformMenu*>(m_menu);
-        if (myMenu) {
-            logRecusion++;
-            stream << myMenu;
-            logRecusion--;
-        }
-    }
-    return stream;
-}

=== removed file 'src/ubuntuappmenu/gmenumodelplatformmenu.h'
--- src/ubuntuappmenu/gmenumodelplatformmenu.h	2017-03-27 08:23:00 +0000
+++ src/ubuntuappmenu/gmenumodelplatformmenu.h	1970-01-01 00:00:00 +0000
@@ -1,181 +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 EXPORTEDPLATFORMMENUBAR_H
-#define EXPORTEDPLATFORMMENUBAR_H
-
-#include <qpa/qplatformmenu.h>
-
-// Local
-class UbuntuGMenuModelExporter;
-class UbuntuMenuRegistrar;
-class QWindow;
-
-class UbuntuPlatformMenuBar : public QPlatformMenuBar
-{
-    Q_OBJECT
-public:
-    UbuntuPlatformMenuBar();
-    ~UbuntuPlatformMenuBar();
-
-    QString exportedPath() const;
-
-    virtual void insertMenu(QPlatformMenu *menu, QPlatformMenu* before) override;
-    virtual void removeMenu(QPlatformMenu *menu) override;
-    virtual void syncMenu(QPlatformMenu *menu) override;
-    virtual void handleReparent(QWindow *newParentWindow) override;
-    virtual QPlatformMenu *menuForTag(quintptr tag) const override;
-
-    const QList<QPlatformMenu*> menus() const;
-
-    QDebug operator<<(QDebug stream);
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    virtual QPlatformMenu *createMenu() const override;
-#endif
-
-Q_SIGNALS:
-    void menuInserted(QPlatformMenu *menu);
-    void menuRemoved(QPlatformMenu *menu);
-
-    void structureChanged();
-    void ready();
-
-private:
-    void setReady(bool);
-
-    QList<QPlatformMenu*> m_menus;
-    QScopedPointer<UbuntuGMenuModelExporter> m_exporter;
-    QScopedPointer<UbuntuMenuRegistrar> m_registrar;
-    bool m_ready;
-};
-
-#define MENU_PROPERTY(class, name, type, defaultValue) \
-    static type get_##name(const class *menuItem) { return menuItem->m_##name; } \
-    type m_##name = defaultValue;
-
-class Q_DECL_EXPORT UbuntuPlatformMenu : public QPlatformMenu
-{
-    Q_OBJECT
-public:
-    UbuntuPlatformMenu();
-    ~UbuntuPlatformMenu();
-
-    virtual void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override;
-    virtual void removeMenuItem(QPlatformMenuItem *menuItem) override;
-    virtual void syncMenuItem(QPlatformMenuItem *menuItem) override;
-    virtual void syncSeparatorsCollapsible(bool enable) override;
-
-    virtual void setTag(quintptr tag) override;
-    virtual quintptr tag() const override;
-
-    virtual void setText(const QString &text) override;
-    virtual void setIcon(const QIcon &icon) override;
-    virtual void setEnabled(bool isEnabled) override;
-    virtual void setVisible(bool isVisible) override;
-    virtual void setMinimumWidth(int width) override;
-    virtual void setFont(const QFont &font) override;
-
-    virtual void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
-
-    virtual void dismiss() override; // Closes this and all its related menu popups
-
-    virtual QPlatformMenuItem *menuItemAt(int position) const override;
-    virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
-
-    virtual QPlatformMenuItem *createMenuItem() const override;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-    virtual QPlatformMenu *createSubMenu() const override;
-#endif
-
-    int id() const;
-
-    const QList<QPlatformMenuItem*> menuItems() const;
-
-    QDebug operator<<(QDebug stream);
-
-Q_SIGNALS:
-    void menuItemInserted(QPlatformMenuItem *menuItem);
-    void menuItemRemoved(QPlatformMenuItem *menuItem);
-    void structureChanged();
-    void enabledChanged(bool);
-
-private:
-    MENU_PROPERTY(UbuntuPlatformMenu, visible, bool, true)
-    MENU_PROPERTY(UbuntuPlatformMenu, text, QString, QString())
-    MENU_PROPERTY(UbuntuPlatformMenu, enabled, bool, true)
-    MENU_PROPERTY(UbuntuPlatformMenu, icon, QIcon, QIcon())
-
-    quintptr m_tag;
-    QList<QPlatformMenuItem*> m_menuItems;
-    const QWindow* m_parentWindow;
-    QScopedPointer<UbuntuGMenuModelExporter> m_exporter;
-    QScopedPointer<UbuntuMenuRegistrar> m_registrar;
-
-    friend class UbuntuGMenuModelExporter;
-};
-
-
-class Q_DECL_EXPORT UbuntuPlatformMenuItem : public QPlatformMenuItem
-{
-    Q_OBJECT
-public:
-    UbuntuPlatformMenuItem();
-    ~UbuntuPlatformMenuItem();
-
-    virtual void setTag(quintptr tag) override;
-    virtual quintptr tag() const override;
-
-    virtual void setText(const QString &text) override;
-    virtual void setIcon(const QIcon &icon) override;
-    virtual void setMenu(QPlatformMenu *menu) override;
-    virtual void setVisible(bool isVisible) override;
-    virtual void setIsSeparator(bool isSeparator) override;
-    virtual void setFont(const QFont &font) override;
-    virtual void setRole(MenuRole role) override;
-    virtual void setCheckable(bool checkable) override;
-    virtual void setChecked(bool isChecked) override;
-    virtual void setShortcut(const QKeySequence& shortcut) override;
-    virtual void setEnabled(bool enabled) override;
-    virtual void setIconSize(int size) override;
-
-    QPlatformMenu* menu() const;
-
-    QDebug operator<<(QDebug stream);
-
-Q_SIGNALS:
-    void checkedChanged(bool);
-    void enabledChanged(bool);
-    void visibleChanged(bool);
-
-private:
-    MENU_PROPERTY(UbuntuPlatformMenuItem, separator, bool, false)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, visible, bool, true)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, text, QString, QString())
-    MENU_PROPERTY(UbuntuPlatformMenuItem, enabled, bool, true)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, checkable, bool, false)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, checked, bool, false)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, shortcut, QKeySequence, QKeySequence())
-    MENU_PROPERTY(UbuntuPlatformMenuItem, icon, QIcon, QIcon())
-    MENU_PROPERTY(UbuntuPlatformMenuItem, iconSize, int, 16)
-    MENU_PROPERTY(UbuntuPlatformMenuItem, menu, QPlatformMenu*, nullptr)
-
-
-    quintptr m_tag;
-    friend class UbuntuGMenuModelExporter;
-};
-
-#endif // EXPORTEDPLATFORMMENUBAR_H

=== removed file 'src/ubuntuappmenu/logging.h'
--- src/ubuntuappmenu/logging.h	2016-08-24 10:08:05 +0000
+++ src/ubuntuappmenu/logging.h	1970-01-01 00:00:00 +0000
@@ -1,27 +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 QUBUNTUTHEMELOGGING_H
-#define QUBUNTUTHEMELOGGING_H
-
-#include <QLoggingCategory>
-
-#define ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
-
-Q_DECLARE_LOGGING_CATEGORY(ubuntuappmenu)
-Q_DECLARE_LOGGING_CATEGORY(ubuntuappmenuRegistrar)
-
-#endif  // QUBUNTUTHEMELOGGING_H

=== removed file 'src/ubuntuappmenu/menuregistrar.cpp'
--- src/ubuntuappmenu/menuregistrar.cpp	2016-09-30 16:10:35 +0000
+++ src/ubuntuappmenu/menuregistrar.cpp	1970-01-01 00:00:00 +0000
@@ -1,137 +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/>.
- */
-
-#include "menuregistrar.h"
-#include "registry.h"
-#include "logging.h"
-
-#include <QDebug>
-#include <QDBusObjectPath>
-#include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatformwindow.h>
-
-namespace {
-
-bool isMirClient() {
-    return qGuiApp->platformName() == "ubuntumirclient";
-}
-
-}
-
-UbuntuMenuRegistrar::UbuntuMenuRegistrar()
-    : m_connection(nullptr)
-    , m_registeredProcessId(~0)
-{
-    GError *error = NULL;
-    m_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-    if (!m_connection) {
-        qCWarning(ubuntuappmenuRegistrar, "Failed to retreive session bus - %s", error ? error->message : "unknown error");
-        g_error_free (error);
-        return;
-    }
-    m_service = g_dbus_connection_get_unique_name(m_connection);
-    connect(UbuntuMenuRegistry::instance(), &UbuntuMenuRegistry::serviceChanged, this, &UbuntuMenuRegistrar::onRegistrarServiceChanged);
-
-    if (isMirClient()) {
-        auto nativeInterface = qGuiApp->platformNativeInterface();
-        connect(nativeInterface, &QPlatformNativeInterface::windowPropertyChanged, this, [this](QPlatformWindow* window, const QString &property) {
-            if (property != QStringLiteral("persistentSurfaceId")) {
-                return;
-            }
-            if (window->window() == m_window) {
-                registerMenuForWindow(m_window, m_path);
-            }
-        });
-    }
-}
-
-UbuntuMenuRegistrar::~UbuntuMenuRegistrar()
-{
-    if (m_connection) {
-        g_object_unref(m_connection);
-    }
-    unregisterMenu();
-}
-
-void UbuntuMenuRegistrar::registerMenuForWindow(QWindow* window, const QDBusObjectPath& path)
-{
-    unregisterMenu();
-
-    m_window = window;
-    m_path = path;
-
-    registerMenu();
-}
-
-void UbuntuMenuRegistrar::registerMenu()
-{
-    if (UbuntuMenuRegistry::instance()->isConnected() && m_window) {
-        if (isMirClient()) {
-            registerSurfaceMenu();
-        } else {
-            registerApplicationMenu();
-        }
-    }
-}
-
-void UbuntuMenuRegistrar::unregisterMenu()
-{
-    if (!m_registeredSurfaceId.isEmpty()) {
-        unregisterSurfaceMenu();
-    } else if (m_registeredProcessId != ~0) {
-        unregisterApplicationMenu();
-    }
-}
-
-void UbuntuMenuRegistrar::registerSurfaceMenu()
-{
-    auto nativeInterface = qGuiApp->platformNativeInterface();
-    QByteArray persistentSurfaceId = nativeInterface->windowProperty(m_window->handle(), "persistentSurfaceId", QByteArray()).toByteArray();
-    if (persistentSurfaceId.isEmpty()) return;
-
-    UbuntuMenuRegistry::instance()->registerSurfaceMenu(persistentSurfaceId, m_path, m_service);
-    m_registeredSurfaceId = persistentSurfaceId;
-}
-
-void UbuntuMenuRegistrar::unregisterSurfaceMenu()
-{
-    if (UbuntuMenuRegistry::instance()->isConnected()) {
-        UbuntuMenuRegistry::instance()->unregisterSurfaceMenu(m_registeredSurfaceId, m_path);
-    }
-    m_registeredSurfaceId.clear();
-}
-
-void UbuntuMenuRegistrar::registerApplicationMenu()
-{
-    pid_t pid = getpid();
-    UbuntuMenuRegistry::instance()->registerApplicationMenu(pid, m_path, m_service);
-    m_registeredProcessId = pid;
-}
-
-void UbuntuMenuRegistrar::unregisterApplicationMenu()
-{
-    if (UbuntuMenuRegistry::instance()->isConnected()) {
-        UbuntuMenuRegistry::instance()->unregisterApplicationMenu(m_registeredProcessId, m_path);
-    }
-    m_registeredProcessId = ~0;
-}
-
-void UbuntuMenuRegistrar::onRegistrarServiceChanged()
-{
-    unregisterMenu();
-    registerMenu();
-}

=== removed file 'src/ubuntuappmenu/menuregistrar.h'
--- src/ubuntuappmenu/menuregistrar.h	2016-09-30 08:35:16 +0000
+++ src/ubuntuappmenu/menuregistrar.h	1970-01-01 00:00:00 +0000
@@ -1,59 +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 MENUREGISTRAR_H
-#define MENUREGISTRAR_H
-
-#include <QObject>
-#include <QWindow>
-#include <QPointer>
-#include <QDBusObjectPath>
-
-#include <gio/gio.h>
-
-class UbuntuMenuRegistrar : public QObject
-{
-    Q_OBJECT
-public:
-    UbuntuMenuRegistrar();
-    ~UbuntuMenuRegistrar();
-
-    void registerMenuForWindow(QWindow* window, const QDBusObjectPath& path);
-    void unregisterMenu();
-
-private Q_SLOTS:
-    void registerSurfaceMenu();
-    void onRegistrarServiceChanged();
-
-private:
-    void registerMenu();
-
-    void registerApplicationMenu();
-    void unregisterApplicationMenu();
-
-    void unregisterSurfaceMenu();
-
-    GDBusConnection *m_connection;
-    QString m_service;
-    QDBusObjectPath m_path;
-    QPointer<QWindow> m_window;
-    QString m_registeredSurfaceId;
-    pid_t m_registeredProcessId;
-};
-
-
-#endif // MENUREGISTRAR_H
-

=== removed file 'src/ubuntuappmenu/qtubuntuextraactionhandler.cpp'
--- src/ubuntuappmenu/qtubuntuextraactionhandler.cpp	2017-03-16 09:42:27 +0000
+++ src/ubuntuappmenu/qtubuntuextraactionhandler.cpp	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2017 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 "qtubuntuextraactionhandler.h"
-
-#include "gmenumodelexporter.h"
-#include "logging.h"
-
-static const gchar introspection_xml[] =
-  "<node>"
-  "  <interface name='qtubuntu.actions.extra'>"
-  "    <method name='aboutToShow'>"
-  "      <arg type='t' name='tag' direction='in'/>"
-  "    </method>"
-  "  </interface>"
-  "</node>";
-
-static void handle_method_call (GDBusConnection       *,
-                                const gchar           *,
-                                const gchar           *,
-                                const gchar           *,
-                                const gchar           *method_name,
-                                GVariant              *parameters,
-                                GDBusMethodInvocation *invocation,
-                                gpointer               user_data)
-{
-
-    if (g_strcmp0 (method_name, "aboutToShow") == 0)
-    {
-        if (g_variant_check_format_string(parameters, "(t)", false)) {
-            auto obj = static_cast<UbuntuGMenuModelExporter*>(user_data);
-            guint64 tag;
-
-            g_variant_get (parameters, "(t)", &tag);
-            obj->aboutToShow(tag);
-        }
-
-        g_dbus_method_invocation_return_value (invocation, NULL);
-    } else {
-        g_dbus_method_invocation_return_error(invocation,
-                                              G_DBUS_ERROR,
-                                              G_DBUS_ERROR_UNKNOWN_METHOD,
-                                              "Unknown method");
-    }
-}
-
-
-static const GDBusInterfaceVTable interface_vtable =
-{
-  handle_method_call,
-  NULL,
-  NULL,
-  NULL
-};
-
-QtUbuntuExtraActionHandler::QtUbuntuExtraActionHandler()
- : m_registration_id(0)
-{
-    m_introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
-}
-
-QtUbuntuExtraActionHandler::~QtUbuntuExtraActionHandler()
-{
-    g_clear_pointer(&m_introspection_data, g_dbus_node_info_unref);
-}
-
-bool QtUbuntuExtraActionHandler::connect(GDBusConnection *connection, const QByteArray &menuPath, UbuntuGMenuModelExporter *gmenuexporter)
-{
-    if (m_registration_id != 0) {
-        qCWarning(ubuntuappmenu, "Called connect in an already connected QtUbuntuExtraActionHandler");
-        return false;
-    }
-
-    GError *error = nullptr;
-    m_registration_id = g_dbus_connection_register_object (connection, menuPath.constData(),
-                            m_introspection_data->interfaces[0],
-                            &interface_vtable,
-                            gmenuexporter,
-                            nullptr,
-                            &error);
-
-    if (!m_registration_id) {
-        qCWarning(ubuntuappmenu, "Failed to extra actions - %s", error ? error->message : "unknown error");
-        g_clear_error(&error);
-    }
-
-    return m_registration_id != 0;
-}
-
-void QtUbuntuExtraActionHandler::disconnect(GDBusConnection *connection) {
-    if (m_registration_id) {
-        g_dbus_connection_unregister_object (connection, m_registration_id);
-    }
-}

=== removed file 'src/ubuntuappmenu/qtubuntuextraactionhandler.h'
--- src/ubuntuappmenu/qtubuntuextraactionhandler.h	2017-03-06 16:19:29 +0000
+++ src/ubuntuappmenu/qtubuntuextraactionhandler.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 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 QTUBUNTUEXTRAACTIONHANDLER_H
-#define QTUBUNTUEXTRAACTIONHANDLER_H
-
-#include <gio/gio.h>
-
-class QByteArray;
-
-class UbuntuGMenuModelExporter;
-
-class QtUbuntuExtraActionHandler
-{
-public:
-    QtUbuntuExtraActionHandler();
-    ~QtUbuntuExtraActionHandler();
-
-    bool connect(GDBusConnection *connection, const QByteArray &menuPath, UbuntuGMenuModelExporter *gmenuexporter);
-    void disconnect(GDBusConnection *connection);
-
-private:
-    GDBusNodeInfo *m_introspection_data;
-    guint m_registration_id;
-};
-
-#endif

=== removed file 'src/ubuntuappmenu/registry.cpp'
--- src/ubuntuappmenu/registry.cpp	2016-09-29 15:12:29 +0000
+++ src/ubuntuappmenu/registry.cpp	1970-01-01 00:00:00 +0000
@@ -1,97 +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/>.
- */
-
-#include "registry.h"
-#include "logging.h"
-#include "menuregistrar_interface.h"
-
-#include <QDBusObjectPath>
-#include <QDBusServiceWatcher>
-
-Q_LOGGING_CATEGORY(ubuntuappmenuRegistrar, "ubuntuappmenu.registrar", QtWarningMsg)
-
-#define REGISTRAR_SERVICE "com.ubuntu.MenuRegistrar"
-#define REGISTRY_OBJECT_PATH "/com/ubuntu/MenuRegistrar"
-
-UbuntuMenuRegistry *UbuntuMenuRegistry::instance()
-{
-    static UbuntuMenuRegistry* registry(new UbuntuMenuRegistry());
-    return registry;
-}
-
-UbuntuMenuRegistry::UbuntuMenuRegistry(QObject* parent)
-    : QObject(parent)
-    , m_serviceWatcher(new QDBusServiceWatcher(REGISTRAR_SERVICE, QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, this))
-    , m_interface(new ComUbuntuMenuRegistrarInterface(REGISTRAR_SERVICE, REGISTRY_OBJECT_PATH, QDBusConnection::sessionBus(), this))
-    , m_connected(m_interface->isValid())
-{
-    connect(m_serviceWatcher.data(), &QDBusServiceWatcher::serviceOwnerChanged, this, &UbuntuMenuRegistry::serviceOwnerChanged);
-}
-
-UbuntuMenuRegistry::~UbuntuMenuRegistry()
-{
-}
-
-void UbuntuMenuRegistry::registerApplicationMenu(pid_t pid, QDBusObjectPath menuObjectPath, const QString &service)
-{
-    qCDebug(ubuntuappmenuRegistrar, "UbuntuMenuRegistry::registerMenu(pid=%d, menuObjectPath=%s, service=%s)",
-            pid,
-            qPrintable(menuObjectPath.path()),
-            qPrintable(service));
-
-    m_interface->RegisterAppMenu(pid, menuObjectPath, menuObjectPath, service);
-}
-
-void UbuntuMenuRegistry::unregisterApplicationMenu(pid_t pid, QDBusObjectPath menuObjectPath)
-{
-    qCDebug(ubuntuappmenuRegistrar, "UbuntuMenuRegistry::unregisterSurfaceMenu(pid=%d, menuObjectPath=%s)",
-            pid,
-            qPrintable(menuObjectPath.path()));
-
-    m_interface->UnregisterAppMenu(pid, menuObjectPath);
-}
-
-void UbuntuMenuRegistry::registerSurfaceMenu(const QString &surfaceId, QDBusObjectPath menuObjectPath, const QString &service)
-{
-    qCDebug(ubuntuappmenuRegistrar, "UbuntuMenuRegistry::registerMenu(surfaceId=%s, menuObjectPath=%s, service=%s)",
-            qPrintable(surfaceId),
-            qPrintable(menuObjectPath.path()),
-            qPrintable(service));
-
-    m_interface->RegisterSurfaceMenu(surfaceId, menuObjectPath, menuObjectPath, service);
-}
-
-void UbuntuMenuRegistry::unregisterSurfaceMenu(const QString &surfaceId, QDBusObjectPath menuObjectPath)
-{
-    qCDebug(ubuntuappmenuRegistrar, "UbuntuMenuRegistry::unregisterSurfaceMenu(surfaceId=%s, menuObjectPath=%s)",
-            qPrintable(surfaceId),
-            qPrintable(menuObjectPath.path()));
-
-    m_interface->UnregisterSurfaceMenu(surfaceId, menuObjectPath);
-}
-
-
-void UbuntuMenuRegistry::serviceOwnerChanged(const QString &serviceName, const QString& oldOwner, const QString &newOwner)
-{
-    qCDebug(ubuntuappmenuRegistrar, "UbuntuMenuRegistry::serviceOwnerChanged(newOwner=%s)", qPrintable(newOwner));
-
-    if (serviceName != REGISTRAR_SERVICE) return;
-
-    if (oldOwner != newOwner) {
-        m_connected = !newOwner.isEmpty();
-        Q_EMIT serviceChanged();
-    }
-}

=== removed file 'src/ubuntuappmenu/registry.h'
--- src/ubuntuappmenu/registry.h	2016-09-29 15:03:17 +0000
+++ src/ubuntuappmenu/registry.h	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 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 UBUNTU_MENU_REGISTRY_H
-#define UBUNTU_MENU_REGISTRY_H
-
-#include <QObject>
-#include <QScopedPointer>
-
-class ComUbuntuMenuRegistrarInterface;
-class QDBusObjectPath;
-class QDBusServiceWatcher;
-
-class UbuntuMenuRegistry : public QObject
-{
-    Q_OBJECT
-public:
-    UbuntuMenuRegistry(QObject* parent = nullptr);
-    virtual ~UbuntuMenuRegistry();
-
-    static UbuntuMenuRegistry *instance();
-
-    void registerApplicationMenu(pid_t pid, QDBusObjectPath menuObjectPath, const QString &service);
-    void unregisterApplicationMenu(pid_t pid, QDBusObjectPath menuObjectPath);
-
-    void registerSurfaceMenu(const QString &surfaceId, QDBusObjectPath menuObjectPath, const QString &service);
-    void unregisterSurfaceMenu(const QString &surfaceId, QDBusObjectPath menuObjectPath);
-
-    bool isConnected() const { return m_connected; }
-
-Q_SIGNALS:
-    void serviceChanged();
-
-private Q_SLOTS:
-    void serviceOwnerChanged(const QString &serviceName, const QString& oldOwner, const QString &newOwner);
-
-private:
-    QScopedPointer<QDBusServiceWatcher> m_serviceWatcher;
-    QScopedPointer<ComUbuntuMenuRegistrarInterface> m_interface;
-    bool m_connected;
-};
-
-#endif // UBUNTU_MENU_REGISTRY_H

=== removed file 'src/ubuntuappmenu/theme.cpp'
--- src/ubuntuappmenu/theme.cpp	2017-03-29 14:16:47 +0000
+++ src/ubuntuappmenu/theme.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 "theme.h"
-#include "gmenumodelplatformmenu.h"
-#include "logging.h"
-
-#include <QtCore/QVariant>
-#include <QDebug>
-
-Q_LOGGING_CATEGORY(ubuntuappmenu, "ubuntuappmenu", QtWarningMsg)
-const char *UbuntuAppMenuTheme::name = "ubuntuappmenu";
-
-namespace {
-
-bool useLocalMenu() {
-    QByteArray menuProxy = qgetenv("UBUNTU_MENUPROXY");
-    bool menuProxyIsZero = !menuProxy.isEmpty() && menuProxy.at(0) == '0';
-    return menuProxyIsZero;
-}
-
-}
-
-UbuntuAppMenuTheme::UbuntuAppMenuTheme():
-    UbuntuTheme()
-{
-    qCDebug(ubuntuappmenu, "UbuntuAppMenuTheme::UbuntuAppMenuTheme() - useLocalMenu=%s", useLocalMenu() ? "true" : "false");
-}
-
-QPlatformMenuItem *UbuntuAppMenuTheme::createPlatformMenuItem() const
-{
-    if (useLocalMenu()) return QGenericUnixTheme::createPlatformMenuItem();
-    return new UbuntuPlatformMenuItem();
-}
-
-QPlatformMenu *UbuntuAppMenuTheme::createPlatformMenu() const
-{
-    if (useLocalMenu()) return QGenericUnixTheme::createPlatformMenu();
-    return new UbuntuPlatformMenu();
-}
-
-QPlatformMenuBar *UbuntuAppMenuTheme::createPlatformMenuBar() const
-{
-    if (useLocalMenu()) return QGenericUnixTheme::createPlatformMenuBar();
-    return new UbuntuPlatformMenuBar();
-}
-
-QPlatformSystemTrayIcon *UbuntuAppMenuTheme::createPlatformSystemTrayIcon() const
-{
-    // We can't use QGenericUnixTheme implementation since it needs the platformMenu to
-    // be a subclass of QDBusPlatformMenu and ours isn't
-    // TODO Investigate if we're fine with not supporting system trays or we should fix it
-    return nullptr;
-}

=== removed file 'src/ubuntuappmenu/theme.h'
--- src/ubuntuappmenu/theme.h	2017-03-29 14:16:47 +0000
+++ src/ubuntuappmenu/theme.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 UBUNTU_THEME_H
-#define UBUNTU_THEME_H
-
-#include "../shared/ubuntutheme.h"
-
-class UbuntuAppMenuTheme : public UbuntuTheme
-{
-public:
-    static const char* name;
-    UbuntuAppMenuTheme();
-    ~UbuntuAppMenuTheme() = default;
-
-    // For the menus
-    QPlatformMenuItem* createPlatformMenuItem() const override;
-    QPlatformMenu* createPlatformMenu() const override;
-    QPlatformMenuBar* createPlatformMenuBar() const override;
-    QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override;
-};
-
-#endif // UBUNTU_THEME_H

=== removed file 'src/ubuntuappmenu/themeplugin.cpp'
--- src/ubuntuappmenu/themeplugin.cpp	2016-09-29 15:03:17 +0000
+++ src/ubuntuappmenu/themeplugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +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/>.
- */
-
-#include "themeplugin.h"
-#include "theme.h"
-
-#include <QDebug>
-
-///////////////////////////////////////////////////////////
-
-UbuntuAppMenuThemePlugin::UbuntuAppMenuThemePlugin(QObject *parent)
-    : QPlatformThemePlugin(parent)
-{
-}
-
-QPlatformTheme *
-UbuntuAppMenuThemePlugin::create(const QString &key, const QStringList&)
-{
-    if (key.compare(QLatin1String(UbuntuAppMenuTheme::name), Qt::CaseInsensitive))
-        return 0;
-
-    return new UbuntuAppMenuTheme();
-}

=== removed file 'src/ubuntuappmenu/themeplugin.h'
--- src/ubuntuappmenu/themeplugin.h	2016-06-21 16:33:19 +0000
+++ src/ubuntuappmenu/themeplugin.h	1970-01-01 00:00:00 +0000
@@ -1,34 +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 UBUNTUTHEMEPLUGIN_H
-#define UBUNTUTHEMEPLUGIN_H
-
-#include <qpa/qplatformthemeplugin.h>
-
-class UbuntuAppMenuThemePlugin : public QPlatformThemePlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "ubuntuappmenu.json")
-public:
-    UbuntuAppMenuThemePlugin(QObject *parent = 0);
-
-    virtual QPlatformTheme *create(const QString &key, const QStringList &paramList);
-
-    static const char *name;
-};
-
-#endif

=== removed file 'src/ubuntuappmenu/ubuntuappmenu.json'
--- src/ubuntuappmenu/ubuntuappmenu.json	2016-06-21 16:33:19 +0000
+++ src/ubuntuappmenu/ubuntuappmenu.json	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "ubuntuappmenu" ]
-}

=== removed file 'src/ubuntuappmenu/ubuntuappmenu.pro'
--- src/ubuntuappmenu/ubuntuappmenu.pro	2017-07-07 08:17:58 +0000
+++ src/ubuntuappmenu/ubuntuappmenu.pro	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-TARGET = ubuntuappmenu
-TEMPLATE = lib
-
-QT -= gui
-QT += core-private theme_support-private dbus
-
-CONFIG += plugin no_keywords
-
-# CONFIG += c++11 # only enables C++0x
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
-QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
-
-CONFIG += link_pkgconfig
-PKGCONFIG += gio-2.0
-
-DBUS_INTERFACES += com.ubuntu.MenuRegistrar.xml
-
-HEADERS += \
-    theme.h \
-    gmenumodelexporter.h \
-    gmenumodelplatformmenu.h \
-    logging.h \
-    menuregistrar.h \
-    registry.h \
-    themeplugin.h \
-    qtubuntuextraactionhandler.h \
-    ../shared/ubuntutheme.h
-
-SOURCES += \
-    theme.cpp \
-    gmenumodelexporter.cpp \
-    gmenumodelplatformmenu.cpp \
-    menuregistrar.cpp \
-    registry.cpp \
-    themeplugin.cpp \
-    qtubuntuextraactionhandler.cpp
-
-OTHER_FILES += \
-    ubuntuappmenu.json
-
-# Installation path
-target.path +=  $$[QT_INSTALL_PLUGINS]/platformthemes
-
-INSTALLS += target

=== modified file 'src/ubuntumirclient/qmirclientbackingstore.cpp'
--- src/ubuntumirclient/qmirclientbackingstore.cpp	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientbackingstore.cpp	2017-10-11 12:40:37 +0000
@@ -44,8 +44,12 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLTexture>
 #include <QtGui/QMatrix4x4>
-#include <QtGui/qopengltextureblitter.h>
 #include <QtGui/qopenglfunctions.h>
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtGui/qopengltextureblitter.h>
+#else
+#  include <QtGui/private/qopengltextureblitter_p.h>
+#endif
 
 QMirClientBackingStore::QMirClientBackingStore(QWindow* window)
     : QPlatformBackingStore(window)

=== removed file 'src/ubuntumirclient/qmirclientclipboard.cpp'
--- src/ubuntumirclient/qmirclientclipboard.cpp	2017-03-02 10:49:22 +0000
+++ src/ubuntumirclient/qmirclientclipboard.cpp	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientclipboard.h"
-#include "qmirclientlogging.h"
-#include "qmirclientwindow.h"
-
-#include <QDBusPendingCallWatcher>
-#include <QGuiApplication>
-#include <QSignalBlocker>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-
-// content-hub
-#include <com/ubuntu/content/hub.h>
-
-// get this cumbersome nested namespace out of the way
-using namespace com::ubuntu::content;
-
-QMirClientClipboard::QMirClientClipboard()
-    : mMimeData(new QMimeData)
-    , mContentHub(Hub::Client::instance())
-{
-    connect(mContentHub, &Hub::pasteboardChanged, this, [this]() {
-        if (mClipboardState == QMirClientClipboard::SyncedClipboard) {
-            mClipboardState = QMirClientClipboard::OutdatedClipboard;
-            emitChanged(QClipboard::Clipboard);
-        }
-    });
-
-    connect(qGuiApp, &QGuiApplication::applicationStateChanged,
-        this, &QMirClientClipboard::onApplicationStateChanged);
-
-    requestMimeData();
-}
-
-QMirClientClipboard::~QMirClientClipboard()
-{
-    delete mMimeData;
-}
-
-QMimeData* QMirClientClipboard::mimeData(QClipboard::Mode mode)
-{
-    if (mode != QClipboard::Clipboard)
-        return nullptr;
-
-    // Blocks dataChanged() signal from being emitted. Makes no sense to emit it from
-    // inside the data getter.
-    const QSignalBlocker blocker(this);
-
-    if (mClipboardState == OutdatedClipboard) {
-        updateMimeData();
-    } else if (mClipboardState == SyncingClipboard) {
-        mPasteReply->waitForFinished();
-    }
-
-    return mMimeData;
-}
-
-void QMirClientClipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
-{
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (focusWindow && mode == QClipboard::Clipboard && mimeData != nullptr) {
-        QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-
-        QDBusPendingCall reply = mContentHub->createPaste(surfaceId, *mimeData);
-
-        // Don't care whether it succeeded
-        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
-        connect(watcher, &QDBusPendingCallWatcher::finished,
-                watcher, &QObject::deleteLater);
-
-        mMimeData = mimeData;
-        mClipboardState = SyncedClipboard;
-        emitChanged(QClipboard::Clipboard);
-    }
-}
-
-bool QMirClientClipboard::supportsMode(QClipboard::Mode mode) const
-{
-    return mode == QClipboard::Clipboard;
-}
-
-bool QMirClientClipboard::ownsMode(QClipboard::Mode mode) const
-{
-    Q_UNUSED(mode);
-    return false;
-}
-
-void QMirClientClipboard::onApplicationStateChanged(Qt::ApplicationState state)
-{
-    if (state == Qt::ApplicationActive) {
-        // Only focused or active applications might be allowed to paste, so we probably
-        // missed changes in the clipboard while we were hidden, inactive or, more importantly,
-        // suspended.
-        requestMimeData();
-    }
-}
-
-void QMirClientClipboard::updateMimeData()
-{
-    if (qGuiApp->applicationState() != Qt::ApplicationActive) {
-        // Don't even bother asking as content-hub would probably ignore our request (and should).
-        return;
-    }
-
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (focusWindow) {
-        delete mMimeData;
-        QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-        mMimeData = mContentHub->latestPaste(surfaceId);
-        mClipboardState = SyncedClipboard;
-        emitChanged(QClipboard::Clipboard);
-    }
-}
-
-void QMirClientClipboard::requestMimeData()
-{
-    if (qGuiApp->applicationState() != Qt::ApplicationActive) {
-        // Don't even bother asking as content-hub would probably ignore our request (and should).
-        return;
-    }
-
-    QWindow *focusWindow = QGuiApplication::focusWindow();
-    if (!focusWindow) {
-        return;
-    }
-
-    QString surfaceId = static_cast<QMirClientWindow*>(focusWindow->handle())->persistentSurfaceId();
-    QDBusPendingCall reply = mContentHub->requestLatestPaste(surfaceId);
-    mClipboardState = SyncingClipboard;
-
-    mPasteReply = new QDBusPendingCallWatcher(reply, this);
-    connect(mPasteReply, &QDBusPendingCallWatcher::finished,
-            this, [this]() {
-        delete mMimeData;
-        mMimeData = mContentHub->paste(*mPasteReply);
-        mClipboardState = SyncedClipboard;
-        mPasteReply->deleteLater();
-        mPasteReply = nullptr;
-        emitChanged(QClipboard::Clipboard);
-    });
-}

=== removed file 'src/ubuntumirclient/qmirclientclipboard.h'
--- src/ubuntumirclient/qmirclientclipboard.h	2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientclipboard.h	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTCLIPBOARD_H
-#define QMIRCLIENTCLIPBOARD_H
-
-#include <qpa/qplatformclipboard.h>
-
-#include <QMimeData>
-#include <QPointer>
-
-namespace com {
-    namespace ubuntu {
-        namespace content {
-            class Hub;
-        }
-    }
-}
-
-class QDBusPendingCallWatcher;
-
-class QMirClientClipboard : public QObject, public QPlatformClipboard
-{
-    Q_OBJECT
-public:
-    QMirClientClipboard();
-    virtual ~QMirClientClipboard();
-
-    // QPlatformClipboard methods.
-    QMimeData* mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
-    void setMimeData(QMimeData* data, QClipboard::Mode mode = QClipboard::Clipboard) override;
-    bool supportsMode(QClipboard::Mode mode) const override;
-    bool ownsMode(QClipboard::Mode mode) const override;
-
-private Q_SLOTS:
-    void onApplicationStateChanged(Qt::ApplicationState state);
-
-private:
-    void updateMimeData();
-    void requestMimeData();
-
-    QMimeData *mMimeData;
-
-    enum {
-        OutdatedClipboard, // Our mimeData is outdated, need to fetch latest from ContentHub
-        SyncingClipboard, // Our mimeData is outdated and we are waiting for ContentHub to reply with the latest paste
-        SyncedClipboard // Our mimeData is in sync with what ContentHub has
-    } mClipboardState{OutdatedClipboard};
-
-    com::ubuntu::content::Hub *mContentHub;
-
-    QDBusPendingCallWatcher *mPasteReply{nullptr};
-};
-
-#endif // QMIRCLIENTCLIPBOARD_H

=== modified file 'src/ubuntumirclient/qmirclientcursor.cpp'
--- src/ubuntumirclient/qmirclientcursor.cpp	2017-03-28 17:12:13 +0000
+++ src/ubuntumirclient/qmirclientcursor.cpp	2017-10-11 12:40:37 +0000
@@ -138,11 +138,17 @@
 {
 public:
     CursorWindowSpec(MirConnection *connection, const char *name)
-    :  spec(mir_create_window_spec(connection))
+    :  CursorWindowSpec(connection)
     {
         mir_window_spec_set_cursor_name(spec, name);
     }
 
+    CursorWindowSpec(MirConnection *connection, MirRenderSurface *surface, int hotspotX, int hotspotY)
+    :  CursorWindowSpec(connection)
+    {
+        mir_window_spec_set_cursor_render_surface(spec, surface, hotspotX, hotspotY);
+    }
+
     ~CursorWindowSpec()
     {
         mir_window_spec_release(spec);
@@ -153,8 +159,60 @@
         mir_window_apply_spec(window, spec);
     }
 private:
+    CursorWindowSpec(MirConnection *connection) : spec(mir_create_window_spec(connection)) {}
     MirWindowSpec * const spec;
 };
+
+class BufferStream
+{
+public:
+    BufferStream(MirRenderSurface *surface, int width, int height)
+    : stream(mir_render_surface_get_buffer_stream(surface, width, height, mir_pixel_format_argb_8888))
+    {
+    }
+
+    void draw(QImage const& image)
+    {
+        MirGraphicsRegion region;
+        const bool validRegion = mir_buffer_stream_get_graphics_region(stream, &region);
+        if (!validRegion)
+            throw std::runtime_error("Could not get graphics region to draw into");
+
+        auto regionLine = region.vaddr;
+        Q_ASSERT(image.bytesPerLine() <= region.stride);
+
+        for (int i = 0; i < image.height(); ++i) {
+           memcpy(regionLine, image.scanLine(i), image.bytesPerLine());
+           regionLine += region.stride;
+        }
+        mir_buffer_stream_swap_buffers_sync(stream);
+    }
+
+private:
+    MirBufferStream * const stream;
+};
+
+class RenderSurface
+{
+public:
+    RenderSurface(MirConnection *connection, int width, int height)
+    : surface(mir_connection_create_render_surface_sync(connection, width, height)),
+      stream(surface, width, height)
+    {
+        if (!mir_render_surface_is_valid(surface)) {
+            throw std::runtime_error(mir_render_surface_get_error_message(surface));
+        }
+    }
+
+    ~RenderSurface() { mir_render_surface_release(surface); }
+    operator MirRenderSurface *() const { return surface; }
+    void draw(QImage const& image) { stream.draw(image); }
+
+private:
+    MirRenderSurface * const surface;
+    BufferStream stream;
+};
+
 } // anonymous namespace
 
 void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
@@ -196,30 +254,15 @@
         image = image.convertToFormat(QImage::Format_ARGB32);
     }
 
-    MirBufferStream *bufferStream = mir_connection_create_buffer_stream_sync(mConnection,
-            image.width(), image.height(), mir_pixel_format_argb_8888, mir_buffer_usage_software);
-
-    {
-        MirGraphicsRegion region;
-        mir_buffer_stream_get_graphics_region(bufferStream, &region);
-
-        char *regionLine = region.vaddr;
-        Q_ASSERT(image.bytesPerLine() <= region.stride);
-        for (int i = 0; i < image.height(); ++i) {
-            memcpy(regionLine, image.scanLine(i), image.bytesPerLine());
-            regionLine += region.stride;
-        }
-    }
-
-    mir_buffer_stream_swap_buffers_sync(bufferStream);
-
-    {
-        auto configuration = mir_cursor_configuration_from_buffer_stream(bufferStream, cursor.hotSpot().x(), cursor.hotSpot().y());
-        mir_window_configure_cursor(window, configuration);
-        mir_cursor_configuration_destroy(configuration);
-    }
-
-    mir_buffer_stream_release_sync(bufferStream);
+    try {
+        RenderSurface surface(mConnection, image.width(), image.height());
+        surface.draw(image);
+
+        CursorWindowSpec spec(mConnection, surface, cursor.hotSpot().x(), cursor.hotSpot().y());
+        spec.apply(window);
+    } catch(std::exception const& e) {
+        qWarning("Error applying pixmap cursor: %s", e.what());
+    }
 }
 
 void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)

=== modified file 'src/ubuntumirclient/qmirclientglcontext.cpp'
--- src/ubuntumirclient/qmirclientglcontext.cpp	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientglcontext.cpp	2017-10-11 12:40:37 +0000
@@ -43,9 +43,14 @@
 #include "qmirclientwindow.h"
 
 #include <QOpenGLFramebufferObject>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-#include <QtEglSupport/private/qeglpbuffer_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtEglSupport/private/qeglconvenience_p.h>
+#  include <QtEglSupport/private/qeglpbuffer_p.h>
+#else
+#  include <QtPlatformSupport/private/qeglconvenience_p.h>
+#  include <QtPlatformSupport/private/qeglpbuffer_p.h>
+#endif
 
 Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)
 

=== modified file 'src/ubuntumirclient/qmirclientglcontext.h'
--- src/ubuntumirclient/qmirclientglcontext.h	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientglcontext.h	2017-10-11 12:40:37 +0000
@@ -42,7 +42,11 @@
 #define QMIRCLIENTGLCONTEXT_H
 
 #include <qpa/qplatformopenglcontext.h>
-#include <QtEglSupport/private/qeglplatformcontext_p.h>
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtEglSupport/private/qeglplatformcontext_p.h>
+#else
+#  include <QtPlatformSupport/private/qeglplatformcontext_p.h>
+#endif
 
 #include <EGL/egl.h>
 

=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
--- src/ubuntumirclient/qmirclientintegration.cpp	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientintegration.cpp	2017-10-11 12:40:37 +0000
@@ -41,7 +41,6 @@
 // Local
 #include "qmirclientintegration.h"
 #include "qmirclientbackingstore.h"
-#include "qmirclientclipboard.h"
 #include "qmirclientdebugextension.h"
 #include "qmirclientdesktopwindow.h"
 #include "qmirclientglcontext.h"
@@ -55,73 +54,111 @@
 // Qt
 #include <QFileInfo>
 #include <QGuiApplication>
+#include <QOpenGLContext>
+#include <QOffscreenSurface>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qplatforminputcontext.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
-#include <QtEglSupport/private/qeglpbuffer_p.h>
-#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
-#include <QOpenGLContext>
-#include <QOffscreenSurface>
-
-// platform-api
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/id.h>
-#include <ubuntu/application/options.h>
-
-static void resumedCallback(const UApplicationOptions */*options*/, void *context)
-{
-    auto integration = static_cast<QMirClientClientIntegration*>(context);
-    integration->appStateController()->setResumed();
+
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtEglSupport/private/qeglconvenience_p.h>
+#  include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#  include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+#  include <QtServiceSupport/private/qgenericunixservices_p.h>
+#  include <QtEglSupport/private/qeglpbuffer_p.h>
+#  include <QtLinuxAccessibilitySupport/private/bridge_p.h>
+#else
+#  include <QtPlatformSupport/private/qeglconvenience_p.h>
+#  include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
+#  include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#  include <QtPlatformSupport/private/qgenericunixservices_p.h>
+#  include <QtPlatformSupport/private/qeglpbuffer_p.h>
+#  include <QtPlatformSupport/private/bridge_p.h>
+#endif
+
+
+
+namespace
+{
+class UbuntuIconTheme : public QGenericUnixTheme
+{
+public:
+    UbuntuIconTheme()
+    {}
+
+    // From QPlatformTheme
+    QVariant themeHint(ThemeHint hint) const override
+    {
+        if (hint == QPlatformTheme::SystemIconThemeName)
+        {
+            QByteArray iconTheme = qgetenv("QTUBUNTU_ICON_THEME");
+            if (iconTheme.isEmpty())
+            {
+                return QVariant(QStringLiteral("ubuntu-mobile"));
+            }
+            else
+            {
+                return QVariant(QString(iconTheme));
+            }
+        }
+        else
+        {
+            return QGenericUnixTheme::themeHint(hint);
+        }
+    }
+};
+
+QByteArray generateSessionNameFromQmlFile(QStringList &args)
+{
+    Q_FOREACH (QString arg, args) {
+        if (arg.endsWith(".qml")) {
+            QFileInfo fileInfo(arg);
+            return fileInfo.fileName().toLocal8Bit();
+        }
+    }
+
+    // give up
+    return "qmlscene";
 }
 
-static void aboutToStopCallback(UApplicationArchive */*archive*/, void *context)
+QByteArray generateSessionName(QStringList args)
 {
-    auto integration = static_cast<QMirClientClientIntegration*>(context);
-    auto inputContext = integration->inputContext();
-    if (inputContext) {
-        inputContext->hideInputPanel();
+    // Try to come up with some meaningful session name to uniquely identify this session,
+    // helping with shell debugging
+    if (args.count() == 0) {
+        return QByteArray("QtUbuntu");
+    } if (args[0].contains("qmlscene")) {
+        return generateSessionNameFromQmlFile(args);
     } else {
-        qCWarning(mirclient) << "aboutToStopCallback(): no input context";
+        // use the executable name
+        QFileInfo fileInfo(args[0]);
+        return fileInfo.fileName().toLocal8Bit();
     }
-    integration->appStateController()->setSuspended();
 }
 
+MirConnection *make_mir_connection()
+{
+    auto sessionName = generateSessionName(QCoreApplication::arguments());
+    auto mirConnection = mir_connect_sync(nullptr, sessionName.data());
+    if (!mir_connection_is_valid(mirConnection))
+    {
+        qCritical("Mir returned: \"%s\"", mir_connection_get_error_message(mirConnection));
+        mir_connection_release(mirConnection);
+        exit(EXIT_FAILURE);
+    }
+    return mirConnection;
+}
+}
 
 QMirClientClientIntegration::QMirClientClientIntegration(int argc, char **argv)
     : QPlatformIntegration()
     , mNativeInterface(new QMirClientNativeInterface(this))
     , mFontDb(new QGenericUnixFontDatabase)
-    , mServices(new QMirClientPlatformServices)
+    , mPlatformServices(new QGenericUnixServices)
     , mAppStateController(new QMirClientAppStateController)
     , mScaleFactor(1.0)
+    , mMirConnection(make_mir_connection())
 {
-    QByteArray sessionName;
-    {
-        QStringList args = QCoreApplication::arguments();
-        setupOptions(args);
-        sessionName = generateSessionName(args);
-        setupDescription(sessionName);
-    }
-
-    // Create new application instance
-    mInstance = u_application_instance_new_from_description_with_options(mDesc, mOptions);
-
-    if (mInstance == nullptr) {
-        qCritical("[QPA] QMirClientClientIntegration: connection to Mir server failed.\n");
-
-        // TODO: add API to platform-api to fetch Mir's error message (bug:1655970).
-        // Workaround by retrying the connection here in order to get the message.
-        auto mirConnection = mir_connect_sync(nullptr, sessionName.data());
-        qCritical("Mir returned: \"%s\"", mir_connection_get_error_message(mirConnection));
-        mir_connection_release(mirConnection);
-        exit(EXIT_FAILURE);
-    }
-
-    mMirConnection = u_application_instance_get_mir_connection(mInstance);
-
     // Choose the default surface format suited to the Mir platform
     QSurfaceFormat defaultFormat;
     defaultFormat.setRedBufferSize(8);
@@ -130,8 +167,7 @@
     QSurfaceFormat::setDefaultFormat(defaultFormat);
 
     // Initialize EGL.
-    mEglNativeDisplay = mir_connection_get_egl_native_display(mMirConnection);
-    ASSERT((mEglDisplay = eglGetDisplay(mEglNativeDisplay)) != EGL_NO_DISPLAY);
+    ASSERT((mEglDisplay = eglGetDisplay(mMirConnection)) != EGL_NO_DISPLAY);
     ASSERT(eglInitialize(mEglDisplay, nullptr, nullptr) == EGL_TRUE);
 
     // Has debug mode been requsted, either with "-testability" switch or QT_LOAD_TESTABILITY env var
@@ -185,70 +221,7 @@
     eglTerminate(mEglDisplay);
     delete mInput;
     delete mInputContext;
-    delete mServices;
-}
-
-QPlatformServices *QMirClientClientIntegration::services() const
-{
-    return mServices;
-}
-
-void QMirClientClientIntegration::setupOptions(QStringList &args)
-{
-    int argc = args.size() + 1;
-    char **argv = new char*[argc];
-    for (int i = 0; i < argc - 1; i++)
-        argv[i] = qstrdup(args.at(i).toLocal8Bit());
-    argv[argc - 1] = nullptr;
-
-    mOptions = u_application_options_new_from_cmd_line(argc - 1, argv);
-
-    for (int i = 0; i < argc; i++)
-        delete [] argv[i];
-    delete [] argv;
-}
-
-void QMirClientClientIntegration::setupDescription(QByteArray &sessionName)
-{
-    mDesc = u_application_description_new();
-
-    UApplicationId* id = u_application_id_new_from_stringn(sessionName.data(), sessionName.count());
-    u_application_description_set_application_id(mDesc, id);
-
-    UApplicationLifecycleDelegate* delegate = u_application_lifecycle_delegate_new();
-    u_application_lifecycle_delegate_set_application_resumed_cb(delegate, &resumedCallback);
-    u_application_lifecycle_delegate_set_application_about_to_stop_cb(delegate, &aboutToStopCallback);
-    u_application_lifecycle_delegate_set_context(delegate, this);
-    u_application_description_set_application_lifecycle_delegate(mDesc, delegate);
-}
-
-QByteArray QMirClientClientIntegration::generateSessionName(QStringList &args)
-{
-    // Try to come up with some meaningful session name to uniquely identify this session,
-    // helping with shell debugging
-
-    if (args.count() == 0) {
-        return QByteArray("QtUbuntu");
-    } if (args[0].contains("qmlscene")) {
-        return generateSessionNameFromQmlFile(args);
-    } else {
-        // use the executable name
-        QFileInfo fileInfo(args[0]);
-        return fileInfo.fileName().toLocal8Bit();
-    }
-}
-
-QByteArray QMirClientClientIntegration::generateSessionNameFromQmlFile(QStringList &args)
-{
-    Q_FOREACH (QString arg, args) {
-        if (arg.endsWith(".qml")) {
-            QFileInfo fileInfo(arg);
-            return fileInfo.fileName().toLocal8Bit();
-        }
-    }
-
-    // give up
-    return "qmlscene";
+    mir_connection_release(mMirConnection);
 }
 
 QPlatformWindow* QMirClientClientIntegration::createPlatformWindow(QWindow* window) const
@@ -262,6 +235,11 @@
     }
 }
 
+QPlatformServices *QMirClientClientIntegration::services() const
+{
+    return mPlatformServices.data();
+}
+
 bool QMirClientClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
 {
     switch (cap) {
@@ -278,7 +256,7 @@
     case ApplicationState:
     case MultipleWindows:
     case NonFullScreenWindows:
-#if QT_VERSION > QT_VERSION_CHECK(5, 5, 0)
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
     case SwitchableWidgetComposition:
 #endif
     case RasterGLSurface: // needed for QQuickWidget
@@ -350,15 +328,6 @@
     return QPlatformIntegration::styleHint(hint);
 }
 
-QPlatformClipboard* QMirClientClientIntegration::clipboard() const
-{
-    static QPlatformClipboard *clipboard = nullptr;
-    if (!clipboard) {
-        clipboard = new QMirClientClipboard;
-    }
-    return clipboard;
-}
-
 QPlatformNativeInterface* QMirClientClientIntegration::nativeInterface() const
 {
     return mNativeInterface;
@@ -394,11 +363,7 @@
     }
 
     qCDebug(mirclient) << "Removing Screen with id" << screen->mirOutputId() << "and geometry" << screen->geometry();
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    delete screen;
-#else
     QPlatformIntegration::destroyScreen(screen);
-#endif
 }
 
 QPlatformAccessibility *QMirClientClientIntegration::accessibility() const

=== modified file 'src/ubuntumirclient/qmirclientintegration.h'
--- src/ubuntumirclient/qmirclientintegration.h	2017-03-15 09:21:47 +0000
+++ src/ubuntumirclient/qmirclientintegration.h	2017-10-11 12:40:37 +0000
@@ -45,13 +45,8 @@
 #include <QSharedPointer>
 
 #include "qmirclientappstatecontroller.h"
-#include "qmirclientplatformservices.h"
 #include "qmirclientscreenobserver.h"
 
-// platform-api
-#include <ubuntu/application/description.h>
-#include <ubuntu/application/instance.h>
-
 #include <EGL/egl.h>
 
 class QMirClientDebugExtension;
@@ -81,7 +76,6 @@
     QPlatformServices *services() const override;
     QPlatformWindow* createPlatformWindow(QWindow* window) const override;
     QPlatformInputContext* inputContext() const override { return mInputContext; }
-    QPlatformClipboard* clipboard() const override;
     void initialize() override;
     QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
     QPlatformAccessibility *accessibility() const override;
@@ -89,7 +83,7 @@
     // New methods.
     MirConnection *mirConnection() const { return mMirConnection; }
     EGLDisplay eglDisplay() const { return mEglDisplay; }
-    EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
+    EGLNativeDisplayType eglNativeDisplay() const { return mMirConnection; }
     QMirClientAppStateController *appStateController() const { return mAppStateController.data(); }
     QMirClientScreenObserver *screenObserver() const { return mScreenObserver.data(); }
     QMirClientDebugExtension *debugExtension() const { return mDebugExtension.data(); }
@@ -100,32 +94,23 @@
 private:
     void setupOptions(QStringList &args);
     void setupDescription(QByteArray &sessionName);
-    static QByteArray generateSessionName(QStringList &args);
-    static QByteArray generateSessionNameFromQmlFile(QStringList &args);
 
     QMirClientNativeInterface* mNativeInterface;
     QPlatformFontDatabase* mFontDb;
 
-    QMirClientPlatformServices* mServices;
-
     QMirClientInput* mInput;
     QPlatformInputContext* mInputContext;
     mutable QScopedPointer<QPlatformAccessibility> mAccessibility;
+    const QScopedPointer<QPlatformServices> mPlatformServices;
+    const QScopedPointer<QMirClientAppStateController> mAppStateController;
     QScopedPointer<QMirClientDebugExtension> mDebugExtension;
     QScopedPointer<QMirClientScreenObserver> mScreenObserver;
-    QScopedPointer<QMirClientAppStateController> mAppStateController;
     qreal mScaleFactor;
 
     MirConnection *mMirConnection;
 
-    // Platform API stuff
-    UApplicationOptions* mOptions;
-    UApplicationDescription* mDesc;
-    UApplicationInstance* mInstance;
-
     // EGL related
     EGLDisplay mEglDisplay{EGL_NO_DISPLAY};
-    EGLNativeDisplayType mEglNativeDisplay;
 };
 
 #endif // QMIRCLIENTINTEGRATION_H

=== removed file 'src/ubuntumirclient/qmirclientplatformservices.cpp'
--- src/ubuntumirclient/qmirclientplatformservices.cpp	2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientplatformservices.cpp	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qmirclientplatformservices.h"
-
-#include <QUrl>
-
-#include <ubuntu/application/url_dispatcher/service.h>
-#include <ubuntu/application/url_dispatcher/session.h>
-
-bool QMirClientPlatformServices::openUrl(const QUrl &url)
-{
-    return callDispatcher(url);
-}
-
-bool QMirClientPlatformServices::openDocument(const QUrl &url)
-{
-    return callDispatcher(url);
-}
-
-bool QMirClientPlatformServices::callDispatcher(const QUrl &url)
-{
-    UAUrlDispatcherSession* session = ua_url_dispatcher_session();
-    if (!session)
-        return false;
-
-    ua_url_dispatcher_session_open(session, url.toEncoded().constData(), NULL, NULL);
-
-    free(session);
-
-    // We are returning true here because the other option
-    // is spawning a nested event loop and wait for the
-    // callback. But there is no guarantee on how fast
-    // the callback is going to be so we prefer to avoid the
-    // nested event loop. Long term plan is improve Qt API
-    // to support an async openUrl
-    return true;
-}

=== removed file 'src/ubuntumirclient/qmirclientplatformservices.h'
--- src/ubuntumirclient/qmirclientplatformservices.h	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientplatformservices.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Canonical, Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QMIRCLIENTPLATFORMSERVICES_H
-#define QMIRCLIENTPLATFORMSERVICES_H
-
-#include <qpa/qplatformservices.h>
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
-
-class QMirClientPlatformServices : public QPlatformServices {
-public:
-    bool openUrl(const QUrl &url) override;
-    bool openDocument(const QUrl &url) override;
-
-private:
-    bool callDispatcher(const QUrl &url);
-};
-
-#endif // QMIRCLIENTPLATFORMSERVICES_H

=== modified file 'src/ubuntumirclient/qmirclientscreen.cpp'
--- src/ubuntumirclient/qmirclientscreen.cpp	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientscreen.cpp	2017-10-11 12:40:37 +0000
@@ -52,7 +52,11 @@
 #include <QScreen>
 #include <QThread>
 #include <qpa/qwindowsysteminterface.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtEglSupport/private/qeglconvenience_p.h>
+#else
+#  include <QtPlatformSupport/private/qeglconvenience_p.h>
+#endif
 
 #include <memory>
 

=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
--- src/ubuntumirclient/qmirclientwindow.cpp	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/qmirclientwindow.cpp	2017-10-11 12:40:37 +0000
@@ -56,8 +56,11 @@
 #include <QSize>
 #include <QtMath>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
-
+#if QT_VERSION > QT_VERSION_CHECK(5, 7, 2)
+#  include <QtEglSupport/private/qeglconvenience_p.h>
+#else
+#  include <QtPlatformSupport/private/qeglconvenience_p.h>
+#endif
 #include <EGL/egl.h>
 
 Q_LOGGING_CATEGORY(mirclientBufferSwap, "qt.qpa.mirclient.bufferSwap", QtWarningMsg)
@@ -75,12 +78,6 @@
 
 using Spec = std::unique_ptr<MirWindowSpec, MirSpecDeleter>;
 
-EGLNativeWindowType nativeWindowFor(MirWindow *surf)
-{
-    auto stream = mir_window_get_buffer_stream(surf);
-    return reinterpret_cast<EGLNativeWindowType>(mir_buffer_stream_get_egl_native_window(stream));
-}
-
 const char *qtWindowStateToStr(Qt::WindowState state)
 {
     switch (state) {
@@ -114,24 +111,6 @@
     Q_UNREACHABLE();
 }
 
-const char *mirPixelFormatToStr(MirPixelFormat pixelFormat)
-{
-    switch (pixelFormat) {
-    case mir_pixel_format_invalid:   return "invalid";
-    case mir_pixel_format_abgr_8888: return "ABGR8888";
-    case mir_pixel_format_xbgr_8888: return "XBGR8888";
-    case mir_pixel_format_argb_8888: return "ARGB8888";
-    case mir_pixel_format_xrgb_8888: return "XRGB8888";
-    case mir_pixel_format_bgr_888:   return "BGR888";
-    case mir_pixel_format_rgb_888:   return "RGB888";
-    case mir_pixel_format_rgb_565:   return "RGB565";
-    case mir_pixel_format_rgba_5551: return "RGBA5551";
-    case mir_pixel_format_rgba_4444: return "RGBA4444";
-    case mir_pixel_formats:          Q_UNREACHABLE();
-    }
-    Q_UNREACHABLE();
-}
-
 const char *mirWindowTypeToStr(MirWindowType type)
 {
     switch (type) {
@@ -221,12 +200,23 @@
     return requiresParent(qtWindowTypeToMirWindowType(type));
 }
 
-Spec makeSurfaceSpec(QWindow *window, MirPixelFormat pixelFormat, QMirClientWindow *parentWindowHandle,
-                     MirConnection *connection)
-{
-    const auto geometry = window->geometry();
-    const int width = geometry.width() > 0 ? geometry.width() : 1;
-    const int height = geometry.height() > 0 ? geometry.height() : 1;
+QRect geometryFor(QWindow *window)
+{
+    auto geometry = window->geometry();
+    if (geometry.width() < 1)
+        geometry.setWidth(1);
+    if (geometry.height() < 1)
+        geometry.setHeight(1);
+
+    return geometry;
+}
+
+Spec makeWindowSpec(QWindow *window, QMirClientWindow *parentWindowHandle,
+                    MirRenderSurface *surface, MirConnection *connection)
+{
+    const auto geometry = geometryFor(window);
+    const int width = geometry.width();
+    const int height = geometry.height();
     auto type = qtWindowTypeToMirWindowType(window->type());
 
     MirRectangle location{geometry.x(), geometry.y(), 0, 0};
@@ -272,7 +262,6 @@
         // There's no helper function for satellite windows. Guess they're not very popular
         spec = Spec{mir_create_window_spec(connection)};
         mir_window_spec_set_type(spec.get(), mir_window_type_satellite);
-        mir_window_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
         mir_window_spec_set_parent(spec.get(), parent);
         mir_window_spec_set_width(spec.get(), width);
         mir_window_spec_set_height(spec.get(), height);
@@ -282,9 +271,9 @@
         break;
     }
 
-    mir_window_spec_set_pixel_format(spec.get(), pixelFormat);
+    mir_window_spec_add_render_surface(spec.get(), surface, width, height, 0, 0);
 
-    qCDebug(mirclient, "makeSurfaceSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",
+    qCDebug(mirclient, "makeWindowSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",
             window, mirWindowTypeToStr(type), window->type(), location.left, location.top, width, height);
 
     return spec;
@@ -331,14 +320,29 @@
     mir_window_spec_set_input_shape(spec, rects, count);
 }
 
+MirRenderSurface *createMirSurface(QWindow *window, MirConnection *connection)
+{
+    const auto geometry = geometryFor(window);
+    const int width = geometry.width();
+    const int height = geometry.height();
+
+    auto surface = mir_connection_create_render_surface_sync(connection, width, height);
+    if (!mir_render_surface_is_valid(surface))
+    {
+        auto errorMsg = mir_render_surface_get_error_message(surface);
+        qFatal("Failed to create mir surface: %s", errorMsg);
+    }
+    return surface;
+}
+
 MirWindow *createMirWindow(QWindow *window, int mirOutputId, QMirClientWindow *parentWindowHandle,
-                             MirPixelFormat pixelFormat, MirConnection *connection,
-                             MirWindowEventCallback inputCallback, void *inputContext)
+                           MirRenderSurface *surface, MirConnection *connection,
+                           MirWindowEventCallback eventCallback, void *context)
 {
-    auto spec = makeSurfaceSpec(window, pixelFormat, parentWindowHandle, connection);
+    auto spec = makeWindowSpec(window, parentWindowHandle, surface, connection);
 
     // Install event handler as early as possible
-    mir_window_spec_set_event_handler(spec.get(), inputCallback, inputContext);
+    mir_window_spec_set_event_handler(spec.get(), eventCallback, context);
 
     const auto title = window->title().toUtf8();
     mir_window_spec_set_name(spec.get(), title.constData());
@@ -358,9 +362,14 @@
         mir_window_spec_set_state(spec.get(), mir_window_state_hidden);
     }
 
-    auto surface = mir_create_window_sync(spec.get());
-    Q_ASSERT(mir_window_is_valid(surface));
-    return surface;
+    auto mirWindow = mir_create_window_sync(spec.get());
+    if (!mir_window_is_valid(mirWindow))
+    {
+        auto errorMsg = mir_window_get_error_message(mirWindow);
+        qFatal("Failed to create mir window: %s", errorMsg);
+    }
+
+    return mirWindow;
 }
 
 QMirClientWindow *getParentIfNecessary(QWindow *window, QMirClientInput *input)
@@ -377,18 +386,6 @@
     return parentWindowHandle;
 }
 
-MirPixelFormat disableAlphaBufferIfPossible(MirPixelFormat pixelFormat)
-{
-    switch (pixelFormat) {
-    case mir_pixel_format_abgr_8888:
-        return mir_pixel_format_xbgr_8888;
-    case mir_pixel_format_argb_8888:
-        return mir_pixel_format_xrgb_8888;
-    default: // can do nothing, leave it alone
-        return pixelFormat;
-    }
-}
-
 // FIXME - in order to work around https://bugs.launchpad.net/mir/+bug/1346633
 // we need to guess the panel height (3GU)
 int panelHeight()
@@ -426,7 +423,6 @@
 
     void onSwapBuffersDone();
     void handleSurfaceResized(int width, int height);
-    int needsRepaint() const;
 
     MirWindowState state() const { return mir_window_get_state(mMirWindow); }
     void setState(MirWindowState state);
@@ -448,7 +444,7 @@
     QString persistentSurfaceId();
 
 private:
-    static void surfaceEventCallback(MirWindow* surface, const MirEvent *event, void* context);
+    static void windowEventCallback(MirWindow* surface, const MirEvent *event, void* context);
     void postEvent(const MirEvent *event);
 
     QWindow * const mWindow;
@@ -458,14 +454,12 @@
     QMirClientWindow * mParentWindowHandle{nullptr};
 
     MirWindow* mMirWindow;
+    MirRenderSurface* mMirSurface;
     const EGLDisplay mEglDisplay;
     EGLSurface mEglSurface;
 
-    bool mNeedsRepaint;
     bool mParented;
-    QSize mBufferSize;
     QSurfaceFormat mFormat;
-    MirPixelFormat mPixelFormat;
 
     QMutex mTargetSizeMutex;
     QSize mTargetSize;
@@ -479,7 +473,6 @@
     , mInput(input)
     , mConnection(connection)
     , mEglDisplay(display)
-    , mNeedsRepaint(false)
     , mParented(mWindow->transientParent() || mWindow->parent())
     , mFormat(mWindow->requestedFormat())
     , mShellChrome(mWindow->flags() & LowChromeWindowHint ? mir_shell_chrome_low : mir_shell_chrome_normal)
@@ -506,50 +499,33 @@
 
     mFormat = q_glFormatFromConfig(display, config, mFormat);
 
-    // Have Mir decide the pixel format most suited to the chosen EGLConfig. This is the only way
-    // Mir will know what EGLConfig has been chosen - it cannot deduce it from the buffers.
-    mPixelFormat = mir_connection_get_egl_pixel_format(connection, display, config);
-    // But the chosen EGLConfig might have an alpha buffer enabled, even if not requested by the client.
-    // If that's the case, try to edit the chosen pixel format in order to disable the alpha buffer.
-    // This is an optimization for the compositor, as it can avoid blending this surface.
-    if (mWindow->requestedFormat().alphaBufferSize() < 0) {
-        mPixelFormat = disableAlphaBufferIfPossible(mPixelFormat);
-    }
-
     const auto outputId = static_cast<QMirClientScreen *>(mWindow->screen()->handle())->mirOutputId();
 
     mParentWindowHandle = getParentIfNecessary(mWindow, input);
 
-    mMirWindow = createMirWindow(mWindow, outputId, mParentWindowHandle, mPixelFormat, connection, surfaceEventCallback, this);
-    mEglSurface = eglCreateWindowSurface(mEglDisplay, config, nativeWindowFor(mMirWindow), nullptr);
+    mMirSurface = createMirSurface(mWindow, connection);
+    mMirWindow = createMirWindow(mWindow, outputId, mParentWindowHandle, mMirSurface, connection, windowEventCallback, this);
+    mEglSurface = eglCreateWindowSurface(mEglDisplay, config, reinterpret_cast<EGLNativeWindowType>(mMirSurface), nullptr);
 
     mNeedsExposeCatchup = mir_window_get_visibility(mMirWindow) == mir_window_visibility_occluded;
 
-    // Window manager can give us a final size different from what we asked for
-    // so let's check what we ended up getting
-    MirWindowParameters parameters;
-    mir_window_get_parameters(mMirWindow, &parameters);
-
+    // Assume that the buffer size matches the surface size at creation time
     auto geom = mWindow->geometry();
-    geom.setWidth(parameters.width);
-    geom.setHeight(parameters.height);
-
-    // Assume that the buffer size matches the surface size at creation time
-    mBufferSize = geom.size();
-    platformWindow->QPlatformWindow::setGeometry(geom);
-    QWindowSystemInterface::handleGeometryChange(mWindow, geom);
 
     qCDebug(mirclient) << "Created surface with geometry:" << geom << "title:" << mWindow->title();
     qCDebug(mirclientGraphics)
                        << "Requested format:" << mWindow->requestedFormat()
-                       << "\nActual format:" << mFormat
-                       << "with associated Mir pixel format:" << mirPixelFormatToStr(mPixelFormat);
+                       << "\nActual format:" << mFormat;
 }
 
 UbuntuSurface::~UbuntuSurface()
 {
-    if (mEglSurface != EGL_NO_SURFACE)
+    if (mEglSurface != EGL_NO_SURFACE) {
         eglDestroySurface(mEglDisplay, mEglSurface);
+    }
+    if (mMirSurface) {
+        mir_render_surface_release(mMirSurface);
+    }
     if (mMirWindow) {
         mir_window_release_sync(mMirWindow);
     }
@@ -606,30 +582,23 @@
 {
     QMutexLocker lock(&mTargetSizeMutex);
 
-    // mir's resize event is mainly a signal that we need to redraw our content. We use the
-    // width/height as identifiers to figure out if this is the latest surface resize event
-    // that has posted, discarding any old ones. This avoids issuing too many redraw events.
-    // see TODO in postEvent as the ideal way we should handle this.
-    // The actual buffer size may or may have not changed at this point, so let the rendering
-    // thread drive the window geometry updates.
-    mNeedsRepaint = mTargetSize.width() == width && mTargetSize.height() == height;
-}
-
-int UbuntuSurface::needsRepaint() const
-{
-    if (mNeedsRepaint) {
-        if (mTargetSize != mBufferSize) {
-            //If the buffer hasn't changed yet, we need at least two redraws,
-            //once to get the new buffer size and propagate the geometry changes
-            //and the second to redraw the content at the new size
-            return 2;
-        } else {
-            // The buffer size has already been updated so we only need one redraw
-            // to render at the new size
-            return 1;
-        }
+    // There could have been a flurry of resize events, only process the latest event
+    const bool needsResize = mTargetSize.width() == width && mTargetSize.height() == height;
+    if (needsResize) {
+        // Resize the buffers
+        mir_render_surface_set_size(mMirSurface, width, height);
+
+        //Resize the window
+        Spec spec{mir_create_window_spec(mConnection)};
+        mir_window_spec_add_render_surface(spec.get(), mMirSurface, width, height, 0, 0);
+        mir_window_apply_spec(mMirWindow, spec.get());
+
+        QRect newGeometry = mPlatformWindow->geometry();
+        newGeometry.setSize(mTargetSize);
+
+        mPlatformWindow->QPlatformWindow::setGeometry(newGeometry);
+        QWindowSystemInterface::handleGeometryChange(mWindow, newGeometry);
     }
-    return 0;
 }
 
 void UbuntuSurface::setState(MirWindowState state)
@@ -653,35 +622,13 @@
     static int sFrameNumber = 0;
     ++sFrameNumber;
 
-    EGLint eglSurfaceWidth = -1;
-    EGLint eglSurfaceHeight = -1;
-    eglQuerySurface(mEglDisplay, mEglSurface, EGL_WIDTH, &eglSurfaceWidth);
-    eglQuerySurface(mEglDisplay, mEglSurface, EGL_HEIGHT, &eglSurfaceHeight);
-
-    const bool validSize = eglSurfaceWidth > 0 && eglSurfaceHeight > 0;
-
-    if (validSize && (mBufferSize.width() != eglSurfaceWidth || mBufferSize.height() != eglSurfaceHeight)) {
-
-        qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - size changed (%d, %d) => (%d, %d)",
-               mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height(), eglSurfaceWidth, eglSurfaceHeight);
-
-        mBufferSize.rwidth() = eglSurfaceWidth;
-        mBufferSize.rheight() = eglSurfaceHeight;
-
-        QRect newGeometry = mPlatformWindow->geometry();
-        newGeometry.setSize(mBufferSize);
-
-        mPlatformWindow->QPlatformWindow::setGeometry(newGeometry);
-        QWindowSystemInterface::handleGeometryChange(mWindow, newGeometry);
-    } else {
-        qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - buffer size (%d,%d)",
-               mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height());
-    }
+    qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d]",
+            mWindow, sFrameNumber);
 }
 
-void UbuntuSurface::surfaceEventCallback(MirWindow *surface, const MirEvent *event, void* context)
+void UbuntuSurface::windowEventCallback(MirWindow *window, const MirEvent *event, void* context)
 {
-    Q_UNUSED(surface);
+    Q_UNUSED(window);
     Q_ASSERT(context != nullptr);
 
     auto s = static_cast<UbuntuSurface *>(context);
@@ -692,9 +639,8 @@
 {
     const auto eventType = mir_event_get_type(event);
     if (mir_event_type_resize == eventType) {
-        // TODO: The current event queue just accumulates all resize events;
-        // It would be nicer if we could update just one event if that event has not been dispatched.
-        // As a workaround, we use the width/height as an identifier of this latest event
+        // The event queue just accumulates all resize events;
+        // Use the width and height as an identifier of this latest event
         // so the event handler (handleSurfaceResized) can discard/ignore old ones.
         const auto resizeEvent = mir_event_get_resize_event(event);
         const auto width =  mir_resize_event_get_width(resizeEvent);
@@ -786,19 +732,6 @@
     qCDebug(mirclient, "handleSurfaceResize(window=%p, size=(%dx%d)px", window(), width, height);
 
     mSurface->handleSurfaceResized(width, height);
-
-    // This resize event could have occurred just after the last buffer swap for this window.
-    // This means the client may still be holding a buffer with the older size. The first redraw call
-    // will then render at the old size. After swapping the client now will get a new buffer with the
-    // updated size but it still needs re-rendering so another redraw may be needed.
-    // A mir API to drop the currently held buffer would help here, so that we wouldn't have to redraw twice
-    auto const numRepaints = mSurface->needsRepaint();
-    lock.unlock();
-    qCDebug(mirclient, "handleSurfaceResize(window=%p) redraw %d times", window(), numRepaints);
-    for (int i = 0; i < numRepaints; i++) {
-        qCDebug(mirclient, "handleSurfaceResize(window=%p) repainting size=(%dx%d)dp", window(), geometry().size().width(), geometry().size().height());
-        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
-    }
 }
 
 void QMirClientWindow::handleSurfaceExposeChange(bool exposed)

=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2017-07-07 08:17:58 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2017-10-11 12:40:37 +0000
@@ -1,25 +1,28 @@
 TARGET = qpa-ubuntumirclient
 TEMPLATE = lib
 
-QT += \
-    core-private dbus linuxaccessibility_support-private \
-    theme_support-private eventdispatcher_support-private \
-    fontdatabase_support-private egl_support-private
+greaterThan(QT_MINOR_VERSION, 7) {
+    QT += \
+        core-private linuxaccessibility_support-private \
+        theme_support-private eventdispatcher_support-private \
+        fontdatabase_support-private egl_support-private service_support-private
+} else {
+    QT += core-private platformsupport-private
+}
 
 CONFIG += plugin no_keywords qpa/genericunixfontdatabase
 
-DEFINES += MESA_EGL_NO_X11_HEADERS
+DEFINES += MESA_EGL_NO_X11_HEADERS MIR_DEPRECATE_RENDERSURFACES=0 MIR_ENABLE_DEPRECATIONS=0
 # CONFIG += c++11 # only enables C++0x
 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
 QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
 QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
 
 CONFIG += link_pkgconfig
-PKGCONFIG += egl mirclient ubuntu-platform-api xkbcommon libcontent-hub
+PKGCONFIG += egl mirclient xkbcommon
 
 SOURCES = \
     qmirclientbackingstore.cpp \
-    qmirclientclipboard.cpp \
     qmirclientcursor.cpp \
     qmirclientdebugextension.cpp \
     qmirclientdesktopwindow.cpp \
@@ -27,7 +30,6 @@
     qmirclientinput.cpp \
     qmirclientintegration.cpp \
     qmirclientnativeinterface.cpp \
-    qmirclientplatformservices.cpp \
     qmirclientplugin.cpp \
     qmirclientscreen.cpp \
     qmirclientscreenobserver.cpp \
@@ -36,7 +38,6 @@
 
 HEADERS = \
     qmirclientbackingstore.h \
-    qmirclientclipboard.h \
     qmirclientcursor.h \
     qmirclientdebugextension.h \
     qmirclientdesktopwindow.h \
@@ -45,7 +46,6 @@
     qmirclientintegration.h \
     qmirclientnativeinterface.h \
     qmirclientorientationchangeevent_p.h \
-    qmirclientplatformservices.h \
     qmirclientplugin.h \
     qmirclientscreenobserver.h \
     qmirclientscreen.h \