Merge lp:~mir-team/qtubuntu/ubuntumirclient-only into lp:qtubuntu

[Gerry Boland]

Major refactor: remove SurfaceFlinger & Mir in-server-process-client support, flatten class hierarchy. Only Mir client QPA remains

Major refactor: remove SF support, remove mir in-server-process-client support, flatten class hierarchy

NOTE: Do not merge independently, must land as part of QtCompositor work only!!!

Depends:
https://code.launchpad.net/~unity-team/platform-api/devel-for-qtmircompositor/+merge/225320

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Y
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
Y - has been in silo6 for >1 week now
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Y - has been in silo6 for >1 week now
 * Has your component "TestPlan” been executed successfully on emulator, N4?
Y
 * Has a 5 minute exploratory testing run been executed on N4?
Oh more than 5 mins.
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
Y
 * What components might get impacted by your changes?
All apps.
 * Have you requested review by the teams of these owning components?
Was a call for testing announced, some bugs were found and have been fixed:
https://bugs.launchpad.net/unity8/+bugs?field.tag=qtcomp

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/146/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Mendoza (ricmm)]

This looks generally fine to me, I will however mark it as needs information due to the API changes required in the platform-api MR.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mir-team/qtubuntu/ubuntumirclient-only]

244. By Daniel d'Andrada on 2014-07-15

Adapt to latest platform-api API

- The new papi Event struct is called WindowEvent
- WindowEvent types have WEVENT instead of EVENT prefixes
- WindowEvent struct is simpler: It does not have the "details" member.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/149/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

From a packaging point of view, this is fine, sure. I might have left the copyright lines as "2013,2014" instead of just "2014" though.

review: Approve (debian-packaging)

[Ricardo Mendoza (ricmm)]

review: Approve

[lp:~mir-team/qtubuntu/ubuntumirclient-only]

245. By Gerry Boland on 2014-07-21

HACK: implement hackish Window::mapToGlobal and isExposed to work around Autopilot relying on QWindow::mapToGlobal for coordinates in screen space

[Ricardo Mendoza (ricmm)]

Blessing the hack.

review: Approve

=== modified file 'README'
--- README	2013-02-12 16:56:42 +0000
+++ README	2014-07-21 23:47:35 +0000
@@ -8,11 +8,8 @@
 1. Description
 --------------
 
-  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.
+  QtUbuntu contains a QPA (Qt Platform Abstraction) plugin based on the Ubuntu
+  Platform API
 
 
 2 Running
@@ -23,13 +20,8 @@
   "-platformpluginpath" command line switch, the following commands
   can be used to run with the Ubuntu QPA plugin:
 
-    $ qmlscene -platform ubuntu Foo.qml
-    $ QT_QPA_PLATFORM=ubuntu qmlscene Foo.qml
-
-  and the following ones to run with the Ubuntu legacy QPA plugin:
-
-    $ qmlscene -platform ubuntulegacy Foo.qml
-    $ QT_QPA_PLATFORM=ubuntulegacy qmlscene Foo.qml
+    $ qmlscene -platform ubuntumirclient Foo.qml
+    $ QT_QPA_PLATFORM=ubuntumirclient qmlscene Foo.qml
 
   The QPA plugins expose the following environment variables:
 
@@ -44,9 +36,6 @@
 
     QTUBUNTU_NO_INPUT: Disables touchscreen and buttons.
 
-    QTUBUNTU_INPUT_DELAY: Specifies a delay in milliseconds for input
-                          initialization (ubuntulegacy plugin only).
-
     QTUBUNTU_ICON_THEME: Specifies the default icon theme name.
 
 
@@ -97,30 +86,3 @@
   [1] http://doc-snapshot.qt-project.org/5.0/qabstractnativeeventfilter.html
   [2] http://doc-snapshot.qt-project.org/5.0/qcoreapplication.html#installNativeEventFilter
 
-
-5. QPA properties
------------------
-
-  The QPA plugin for Ubuntu looks for a "session" dynamic property on
-  the QPlatformNativeInterface object in order to know the session
-  type to request. That property can be set to an integer representing
-  a SessionType specified in the Ubuntu Platform API before the first
-  window is shown. In order to request a system session type, the
-  following code can be used:
-
-    #include <qpa/qplatformnativeinterface.h>
-    ...
-    QPlatformNativeInterface* native = QGuiApplication::platformNativeInterface();
-    native->setProperty("session", static_cast<int>(USER_SESSION_TYPE));
-
-  The plugin also looks for "role" and "opaque" dynamic properties on
-  the QWindow object. The "role" property can be set to an integer
-  representing a SurfaceRole and the "opaque" property can be set to 0
-  or 1 to specify whether or not the surface shoud be considered
-  opaque by the compositor. Note that these properties must be set
-  before the window is shown. In order to request a launcher role and
-  an opaque window, the following code can be used:
-
-    QQuickView* view = new QQuickView();
-    view->setProperty("role", static_cast<int>(LAUNCHER_ACTOR_ROLE));
-    view->setProperty("opaque", 1);

=== removed file 'TODO'
--- TODO	2012-10-16 15:41:36 +0000
+++ TODO	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-To do
------
-
-  Empty!

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-13 05:37:53 +0000
+++ debian/changelog	2014-07-21 23:47:35 +0000
@@ -1,3 +1,10 @@
+qtubuntu (0.60) UNRELEASED; urgency=medium
+
+  * Major refactor: remove SurfaceFlinger & Mir in-server-process-client support, 
+    flatten class hierarchy. Only Mir client QPA remains
+
+ -- Gerry Boland <[e-mail]>  Mon, 30 Jun 2014 12:05:37 +0100
+
 qtubuntu (0.54+14.10.20140613-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-05-29 10:28:33 +0000
+++ debian/control	2014-07-21 23:47:35 +0000
@@ -3,14 +3,12 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libatspi2.0-dev,
-               libdbus-1-dev,
                libegl1-mesa-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
-               libhybris-dev,
-               libubuntu-application-api-dev (>= 2.0.0),
+               libubuntu-application-api-dev (>= 2.2.0),
                libudev-dev,
                libxrender-dev,
                libxkbcommon-dev,
@@ -18,7 +16,6 @@
                qtbase5-private-dev,
                qtdeclarative5-dev,
                libqt5sensors5-dev,
-               zlib1g-dev,
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
 # upstream branch

=== modified file 'debian/copyright'
--- debian/copyright	2013-03-13 02:30:19 +0000
+++ debian/copyright	2014-07-21 23:47:35 +0000
@@ -2,11 +2,11 @@
 Upstream-Name: qtubuntu
 
 Files: *
-Copyright: 2013 Canonical Ltd.
+Copyright: 2014 Canonical Ltd.
 License: LGPL-3
 
 Files: debian/*
-Copyright: 2013 Canonical Ltd.
+Copyright: 2014 Canonical Ltd.
 License: GPL-3
 
 Files: tests/*

=== modified file 'debian/docs'
--- debian/docs	2012-10-03 16:16:07 +0000
+++ debian/docs	2014-07-21 23:47:35 +0000
@@ -1,2 +1,1 @@
 README
-TODO

=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2014-05-29 10:26:54 +0000
+++ debian/rules	2014-07-21 23:47:35 +0000
@@ -24,9 +24,9 @@
 
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
 endif
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
+	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
 
 override_dh_auto_build:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))

=== removed file 'deploy.sh'
--- deploy.sh	2014-03-25 17:42:14 +0000
+++ deploy.sh	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash -i
-
-adb push src/platforms/ubuntu/libqubuntu.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
-adb push src/platforms/ubuntu/libqubuntumir.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
-adb push src/platforms/ubuntu/libqubuntumirserver.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
-adb push src/platforms/ubuntulegacy/libqubuntulegacy.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/plugins/platforms
-adb push tests/qmlscene_ubuntu/qmlscene-ubuntu /data/ubuntu/usr/bin
-adb push tests/clipboard/clipboard /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/Logo.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/MovingLogo.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/WarpingLogo.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/Input.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/Application.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/Fullscreen.qml /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/logo.png /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests
-adb push tests/noise.png /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/tests

=== modified file 'qtubuntu.pro'
--- qtubuntu.pro	2013-02-05 02:05:42 +0000
+++ qtubuntu.pro	2014-07-21 23:47:35 +0000
@@ -1,7 +1,2 @@
-load(configure)
-load(qt_parts)
-
-# FIXME(loicm) I don't get why qmake automatically detects src/ but not
-#     tests/. Doing it that way makes make warn about the generated Makefile.
 TEMPLATE = subdirs
-SUBDIRS += tests
+SUBDIRS += src tests

=== removed directory 'src/platforms'
=== removed file 'src/platforms/platforms.pro'
--- src/platforms/platforms.pro	2013-06-21 17:23:48 +0000
+++ src/platforms/platforms.pro	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += base ubuntu
-
-ubuntu.depends = base

=== removed directory 'src/platforms/ubuntu'
=== removed directory 'src/platforms/ubuntu/ubuntu'
=== removed file 'src/platforms/ubuntu/ubuntu.pro'
--- src/platforms/ubuntu/ubuntu.pro	2013-06-21 18:04:03 +0000
+++ src/platforms/ubuntu/ubuntu.pro	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-TEMPLATE = subdirs
-
-!mirclient:!mirserver {
-CONFIG += hybris
-}
-
-hybris {
-SUBDIRS += ubuntu
-}
-
-SUBDIRS += ubuntucommon ubuntumir
-
-ubuntu.depends = ubuntucommon
-ubuntumir.depends = ubuntucommon

=== removed file 'src/platforms/ubuntu/ubuntu/main.cc'
--- src/platforms/ubuntu/ubuntu/main.cc	2013-11-19 09:00:47 +0000
+++ src/platforms/ubuntu/ubuntu/main.cc	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 <qpa/qplatformintegrationplugin.h>
-#include "ubuntucommon/integration.h"
-#include "ubuntucommon/input.h"
-#include "ubuntucommon/input_adaptor_factory.h"
-
-namespace
-{
-struct InputAdaptorFactory : public QUbuntuInputAdaptorFactory {
-  InputAdaptorFactory() {}
-  ~InputAdaptorFactory() {}
-    
-  QUbuntuInput* create_input_adaptor(QUbuntuIntegration *integration){
-    return new QUbuntuInput(integration);
-  }
-    
-  static InputAdaptorFactory* instance(){
-    static InputAdaptorFactory global_instance;
-    return &global_instance;
-  }
-};
-}
-
-
-QT_BEGIN_NAMESPACE
-
-class QUbuntuIntegrationPlugin : public QPlatformIntegrationPlugin {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid
-                    FILE "ubuntu.json")
-
- public:
-  QStringList keys() const;
-  QPlatformIntegration* create(const QString&, const QStringList&);
-};
-
-QStringList QUbuntuIntegrationPlugin::keys() const {
-  QStringList list;
-  list << "ubuntu";
-  return list;
-}
-
-QPlatformIntegration* QUbuntuIntegrationPlugin::create(
-    const QString& system, const QStringList& paramList) {
-  Q_UNUSED(paramList);
-  if (system.toLower() == "ubuntu")
-    return new QUbuntuIntegration(InputAdaptorFactory::instance());
-  return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"

=== removed file 'src/platforms/ubuntu/ubuntu/ubuntu.json'
--- src/platforms/ubuntu/ubuntu/ubuntu.json	2013-06-10 20:48:03 +0000
+++ src/platforms/ubuntu/ubuntu/ubuntu.json	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "ubuntu" ]
-}

=== removed file 'src/platforms/ubuntu/ubuntu/ubuntu.pro'
--- src/platforms/ubuntu/ubuntu/ubuntu.pro	2013-11-22 15:30:14 +0000
+++ src/platforms/ubuntu/ubuntu/ubuntu.pro	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-TARGET = qubuntu
-TEMPLATE = lib
-
-QT += gui-private platformsupport-private sensors
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = main.cc
-
-CONFIG += plugin link_prl link_pkgconfig
-
-PKGCONFIG += egl
-INCLUDEPATH += ../../ ../
-LIBS += -L../ubuntucommon -lqubuntucommon -lubuntu_application_api -L../../base -lubuntubase
-
-OTHER_FILES += ubuntu.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target

=== removed directory 'src/platforms/ubuntu/ubuntucommon'
=== removed file 'src/platforms/ubuntu/ubuntucommon/clipboard.cc'
--- src/platforms/ubuntu/ubuntucommon/clipboard.cc	2013-05-21 22:11:57 +0000
+++ src/platforms/ubuntu/ubuntucommon/clipboard.cc	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
-
-// FIXME(loicm) The clipboard data format is not defined by Ubuntu Platform API
-//     which makes it impossible to have non-Qt applications communicate with Qt
-//     applications through the clipboard API. The solution would be to have
-//     Ubuntu Platform define the data format or propose an API that supports
-//     embedding different mime types in the clipboard.
-
-// Data format:
-//   number of mime types      (4 bytes)
-//   data layout               (16 bytes * number of mime types)
-//     mime type string offset (4 bytes)
-//     mime type string size   (4 bytes)
-//     data offset             (4 bytes)
-//     data size               (4 bytes)
-//   data                      (n bytes)
-
-#include "clipboard.h"
-#include "base/logging.h"
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-#include <ubuntu/application/ui/clipboard.h>
-
-const int maxFormatsCount = 16;
-const int maxBufferSize = 4 * 1024 * 1024;  // 4 Mb
-
-QUbuntuClipboard::QUbuntuClipboard()
-    : QUbuntuBaseClipboard()
-    , mimeData_(new QMimeData()) {
-  DLOG("QUbuntuClipboard::QUbuntuClipboard (this=%p)", this);
-}
-
-QUbuntuClipboard::~QUbuntuClipboard() {
-  DLOG("QUbuntuClipboard::~QUbuntuClipboard");
-  delete mimeData_;
-}
-
-QMimeData* QUbuntuClipboard::mimeData(QClipboard::Mode mode) {
-  Q_UNUSED(mode);
-  DLOG("QUbuntuClipboard::mimeData (this=%p, mode=%d)", this, static_cast<int>(mode));
-  // Get clipboard data.
-  void* data = NULL;
-  size_t size = 0;
-  ua_ui_get_clipboard_content(&data, &size);
-
-  // Deserialize, update and return mime data taking care of incorrectly
-  // formatted input.
-  mimeData_->clear();
-  if (static_cast<size_t>(size) > sizeof(int)  // Should be at least that big to read the count.
-      && data != NULL) {
-    const char* const buffer = reinterpret_cast<char*>(data);
-    const int* const header = reinterpret_cast<int*>(data);
-    const int count = qMin(header[0], maxFormatsCount);
-    for (int i = 0; i < count; i++) {
-      const unsigned int formatOffset = header[i*4+1];
-      const unsigned int formatSize = header[i*4+2];
-      const unsigned int dataOffset = header[i*4+3];
-      const unsigned int dataSize = header[i*4+4];
-      if (formatOffset + formatSize <= size && dataOffset + dataSize <= size) {
-        mimeData_->setData(QString(&buffer[formatOffset]),
-                           QByteArray(&buffer[dataOffset], dataSize));
-      }
-    }
-  }
-  return mimeData_;
-}
-
-void QUbuntuClipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode) {
-  Q_UNUSED(mode);
-  DLOG("QUbuntuClipboard::setMimeData (this=%p, data=%p, mode=%d)", this, mimeData,
-       static_cast<int>(mode));
-  if (mimeData == NULL) {
-    ua_ui_set_clipboard_content(NULL, 0);
-    return;
-  }
-
-  const QStringList formats = mimeData->formats();
-  const int count = qMin(formats.size(), maxFormatsCount);
-  const int headerSize = sizeof(int) + count * 4 * sizeof(int);
-  int bufferSize = headerSize;
-  char* buffer;
-
-  // Get the buffer size considering the header size, the NULL-terminated
-  // formats and the non NULL-terminated data.
-  for (int i = 0; i < count; i++)
-    bufferSize += formats[i].size() + 1 + mimeData->data(formats[i]).size();
-  // FIXME(loicm) Implement max buffer size limitation.
-  // FIXME(loicm) Remove ASSERT before release.
-  ASSERT(bufferSize <= maxBufferSize);
-
-  // Serialize data.
-  buffer = new char[bufferSize];
-  int* header = reinterpret_cast<int*>(buffer);
-  int offset = headerSize;
-  header[0] = count;
-  for (int i = 0; i < count; i++) {
-    const int formatOffset = offset;
-    const int formatSize = formats[i].size() + 1;
-    const int dataOffset = offset + formatSize;
-    const int dataSize = mimeData->data(formats[i]).size();
-    memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
-    memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
-    header[i*4+1] = formatOffset;
-    header[i*4+2] = formatSize;
-    header[i*4+3] = dataOffset;
-    header[i*4+4] = dataSize;
-    offset += formatSize + dataSize;
-  }
-
-  // Set clipboard content.
-  ua_ui_set_clipboard_content(reinterpret_cast<void*>(buffer), bufferSize);
-  delete [] buffer;
-}

=== removed file 'src/platforms/ubuntu/ubuntucommon/clipboard.h'
--- src/platforms/ubuntu/ubuntucommon/clipboard.h	2013-02-05 02:05:42 +0000
+++ src/platforms/ubuntu/ubuntucommon/clipboard.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUCLIPBOARD_H
-#define QUBUNTUCLIPBOARD_H
-
-#include "base/clipboard.h"
-
-class QUbuntuClipboard : public QUbuntuBaseClipboard {
- public:
-  QUbuntuClipboard();
-  ~QUbuntuClipboard();
-
-  // QUbuntuBaseClipboard methods.
-  QMimeData* mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
-  void setMimeData(QMimeData* data, QClipboard::Mode mode = QClipboard::Clipboard);
-
- private:
-  QMimeData* mimeData_;
-};
-
-#endif  // QUBUNTUCLIPBOARD_H

=== removed file 'src/platforms/ubuntu/ubuntucommon/input.cc'
--- src/platforms/ubuntu/ubuntucommon/input.cc	2013-10-17 18:38:03 +0000
+++ src/platforms/ubuntu/ubuntucommon/input.cc	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "input.h"
-#include "integration.h"
-#include "base/logging.h"
-#include <ubuntu/application/ui/input/event.h>
-
-QUbuntuInput::QUbuntuInput(QUbuntuIntegration* integration)
-    : QUbuntuBaseInput(integration)
-    , sessionType_(0) {
-  DLOG("QUbuntuInput::QUbuntuInput (this=%p integration=%p)", this, integration);
-}
-
-QUbuntuInput::~QUbuntuInput() {
-  DLOG("QUbuntuInput::~QUbuntuInput");
-}
-
-void QUbuntuInput::handleTouchEvent(
-    QWindow* window, ulong timestamp, QTouchDevice* device,
-    const QList<struct QWindowSystemInterface::TouchPoint> &points) {
-  DLOG("QUbuntuInput::handleTouchEvent (this=%p, window=%p, timestamp=%lu, device=%p)",
-       this, window, timestamp, device);
-  if (sessionType_ != 1) {
-    QUbuntuBaseInput::handleTouchEvent(window, timestamp, device, points);
-  } else {
-    // Ubuntu platform API creates an input handler per window. Since system sessions have
-    // fullscreen input handlers, the last created window has an input handler that takes precedence
-    // over the others. Because of that, only the last created window receives touch input. In order
-    // to fix that issue for system sessions, we pass the NULL pointer to the Qt handler as window
-    // argument so that it pushes the event to the window that's located at the touch point.
-    QUbuntuBaseInput::handleTouchEvent(NULL, timestamp, device, points);
-  }
-}
-
-void QUbuntuInput::setSessionType(uint sessionType) {
-  DLOG("QUbuntuInput::setSessionType (this=%p, window=%u)", this, sessionType);
-  sessionType_ = sessionType;
-}

=== removed file 'src/platforms/ubuntu/ubuntucommon/input.h'
--- src/platforms/ubuntu/ubuntucommon/input.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntu/ubuntucommon/input.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUINPUT_H
-#define QUBUNTUINPUT_H
-
-#include "base/input.h"
-
-class QUbuntuIntegration;
-
-class QUbuntuInput : public QUbuntuBaseInput {
- public:
-  QUbuntuInput(QUbuntuIntegration* integration);
-  ~QUbuntuInput();
-
-  // QUbuntuBaseInput methods.
-  void handleTouchEvent(QWindow* window, ulong timestamp, QTouchDevice* device,
-                        const QList<struct QWindowSystemInterface::TouchPoint> &points);
-
-  void setSessionType(uint sessionType);
-
- private:
-  uint sessionType_;
-};
-
-#endif  // QUBUNTUINPUT_H

=== removed file 'src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h'
--- src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h	2013-06-24 17:52:59 +0000
+++ src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTU_INPUT_ADAPTOR_FACTORY_H_
-#define QUBUNTU_INPUT_ADAPTOR_FACTORY_H_
-
-class QUbuntuInput;
-class QUbuntuIntegration;
-
-class QUbuntuInputAdaptorFactory {
- public:
-  virtual ~QUbuntuInputAdaptorFactory() {}
-    
-  virtual QUbuntuInput* create_input_adaptor(QUbuntuIntegration* integration) = 0;
-
- protected:
-  QUbuntuInputAdaptorFactory() {}
-};
-
-#endif

=== removed file 'src/platforms/ubuntu/ubuntucommon/integration.cc'
--- src/platforms/ubuntu/ubuntucommon/integration.cc	2014-05-22 01:25:21 +0000
+++ src/platforms/ubuntu/ubuntucommon/integration.cc	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "integration.h"
-#include "window.h"
-#include "input.h"
-#include "clipboard.h"
-#include "input_adaptor_factory.h"
-#include "base/logging.h"
-#include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatforminputcontextfactory_p.h>
-#include <qpa/qplatforminputcontext.h>
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/id.h>
-#include <ubuntu/application/options.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-
-static void resumedCallback(const UApplicationOptions *options, void* context) {
-  DLOG("resumedCallback (options=%p, context=%p)", options, context);
-  DASSERT(context != NULL);
-  QUbuntuIntegration* integration = static_cast<QUbuntuIntegration*>(context);
-  integration->screen()->toggleSensors(true);
-  QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(QEvent::ApplicationActivate));
-
-  Q_FOREACH(QWindow *window, QGuiApplication::allWindows()) {
-    QGuiApplication::postEvent(window, new QExposeEvent( window->geometry() ));
-  }
-}
-
-static void aboutToStopCallback(UApplicationArchive *archive, void* context) {
-  DLOG("aboutToStopCallback (archive=%p, context=%p)", archive, context);
-  DASSERT(context != NULL);
-  QUbuntuIntegration* integration = static_cast<QUbuntuIntegration*>(context);
-  integration->screen()->toggleSensors(false);
-  integration->inputContext()->hideInputPanel();
-
-  Q_FOREACH(QWindow *window, QGuiApplication::allWindows()) {
-    QGuiApplication::postEvent(window, new QExposeEvent( QRegion() ));
-  }
-
-  QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(QEvent::ApplicationDeactivate));
-}
-
-QUbuntuIntegration::QUbuntuIntegration(QUbuntuInputAdaptorFactory *input_factory)
-    : clipboard_(new QUbuntuClipboard()) {
-  // Init Ubuntu Platform library.
-  QStringList args = QCoreApplication::arguments();
-  argc_ = args.size() + 1;
-  argv_ = new char*[argc_];
-  for (int i = 0; i < argc_ - 1; i++)
-    argv_[i] = qstrdup(args.at(i).toLocal8Bit());
-  argv_[argc_ - 1] = NULL;
-  // Setup options
-  options_ = u_application_options_new_from_cmd_line(argc_ - 1, argv_);
-
-  // Setup application description
-  desc_ = u_application_description_new();
-  UApplicationId* id = u_application_id_new_from_stringn("QtUbuntu", 8);
-  u_application_description_set_application_id(desc_, 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(desc_, delegate);
-
-  // Create new application instance
-  instance_ = u_application_instance_new_from_description_with_options(desc_, options_);
-
-  if (instance_ == NULL)
-    qFatal("QUbuntu: Could not create application instance");
-
-  // Create default screen.
-  screen_ = new QUbuntuScreen(options_);
-  screenAdded(screen_);
-
-  // FIXME (ricmm) We shouldn't disable sensors for the shell process
-  // it is only valid right now because the shell doesnt use them
-  screen_->toggleSensors(false);
-  isShell_ = false;
-  if (args.contains("unity8") || args.contains("/usr/bin/unity8") ||
-      args.contains("unity8-greeter") || args.contains("/usr/bin/unity8-greeter"))
-    isShell_ = true;
-
-  // Initialize input.
-  if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_INPUT")) {
-    input_ = input_factory->create_input_adaptor(this);
-    inputContext_ = QPlatformInputContextFactory::create();
-  } else {
-    input_ = NULL;
-    inputContext_ = NULL;
-  }
-
-  DLOG("QUbuntuIntegration::QUbuntuIntegration (this=%p)", this);
-}
-
-QUbuntuIntegration::~QUbuntuIntegration() {
-  DLOG("QUbuntuIntegration::~QUbuntuIntegration");
-  delete clipboard_;
-  delete input_;
-  delete inputContext_;
-  delete screen_;
-  for (int i = 0; i < argc_; i++)
-    delete [] argv_[i];
-  delete [] argv_;
-}
-
-QPlatformWindow* QUbuntuIntegration::createPlatformWindow(QWindow* window) const {
-  DLOG("QUbuntuIntegration::createPlatformWindow const (this=%p, window=%p)", this, window);
-  return const_cast<QUbuntuIntegration*>(this)->createPlatformWindow(window);
-}
-
-QPlatformWindow* QUbuntuIntegration::createPlatformWindow(QWindow* window) {
-  DLOG("QUbuntuIntegration::createPlatformWindow (this=%p, window=%p)", this, window);
-  static uint sessionType;
-
-  // Start a session before creating the first window.
-  static bool once = false;
-  if (!once) {
-    sessionType = nativeInterface()->property("session").toUInt();
-    // FIXME(loicm) Remove that once all system applications have been ported to the new property.
-    if (sessionType == 0) {
-      sessionType = nativeInterface()->property("ubuntuSessionType").toUInt();
-    }
-#if !defined(QT_NO_DEBUG)
-    ASSERT(sessionType <= U_SYSTEM_SESSION);
-    const char* const sessionTypeString[] = {
-      "User", "System"
-    };
-    const char* const stageHintString[] = {
-      "Main", "Integration", "Share", "Content picking", "Side", "Configuration",
-    };
-    const char* const formFactorHintString[] = {
-      "Desktop", "Phone", "Tablet"
-    };
-    LOG("ubuntu session type: '%s'", sessionTypeString[sessionType]);
-    LOG("ubuntu application stage hint: '%s'",
-        stageHintString[u_application_options_get_stage(options_)]);
-    LOG("ubuntu application form factor: '%s'",
-        formFactorHintString[u_application_options_get_form_factor(options_)]);
-#endif
-  
-    LOG("callbacks %p %p", &resumedCallback, &aboutToStopCallback);
-    
-    props_ = ua_ui_session_properties_new();
-    ua_ui_session_properties_set_type(props_, static_cast<UAUiSessionType>(sessionType));
-
-    ua_ui_session_properties_set_remote_pid(props_,
-      static_cast<uint32_t>(QCoreApplication::applicationPid()));
-
-    session_ = ua_ui_session_new_with_properties(props_);
-
-    input_->setSessionType(sessionType);
-    once = true;
-  }
-
-  QStringList args = QCoreApplication::arguments();
-    
-  // Create the window.
-  QPlatformWindow* platformWindow = new QUbuntuWindow(
-      window, static_cast<QUbuntuScreen*>(screen_), input_, static_cast<bool>(sessionType), instance_, isShell_);
-  platformWindow->requestActivateWindow();
-  return platformWindow;
-}

=== removed file 'src/platforms/ubuntu/ubuntucommon/integration.h'
--- src/platforms/ubuntu/ubuntucommon/integration.h	2013-08-08 15:29:08 +0000
+++ src/platforms/ubuntu/ubuntucommon/integration.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUINTEGRATION_H
-#define QUBUNTUINTEGRATION_H
-
-#include "base/integration.h"
-#include "screen.h"
-#include <ubuntu/application/instance.h>
-#include <ubuntu/application/ui/session.h>
-
-class QUbuntuInputAdaptorFactory;
-class QUbuntuInput;
-
-class QUbuntuIntegration : public QUbuntuBaseIntegration {
- public:
-  QUbuntuIntegration(QUbuntuInputAdaptorFactory* input_factory);
-  ~QUbuntuIntegration();
-
-  // QPlatformIntegration methods.
-  QPlatformWindow* createPlatformWindow(QWindow* window) const;
-  QPlatformWindow* createPlatformWindow(QWindow* window);
-  QPlatformInputContext* inputContext() const { return inputContext_; }
-  QPlatformClipboard* clipboard() const { return clipboard_; }
-  QUbuntuScreen* screen() const { return screen_; }
-
- private:
-  int argc_;
-  char** argv_;
-  QUbuntuScreen* screen_;
-  QUbuntuInput* input_;
-  QPlatformInputContext* inputContext_;
-  QPlatformClipboard* clipboard_;
-  bool isShell_;
-
-  UApplicationOptions* options_;
-  UApplicationDescription* desc_;
-  UApplicationInstance* instance_;
-  UAUiSessionProperties* props_;
-  UAUiSession* session_;
-};
-
-#endif  // QUBUNTUINTEGRATION_H

=== removed file 'src/platforms/ubuntu/ubuntucommon/screen.cc'
--- src/platforms/ubuntu/ubuntucommon/screen.cc	2014-02-20 23:03:54 +0000
+++ src/platforms/ubuntu/ubuntucommon/screen.cc	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
-
-// Unit conversion code has been extracted from the Ubuntu UI toolkit.
-
-#include "screen.h"
-#include "base/logging.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/qmath.h>
-#include <QtSensors/QOrientationSensor>
-#include <QtSensors/QOrientationReading>
-#include <QtGui/QScreen>
-#include <QtCore/QThread>
-#include <qpa/qwindowsysteminterface.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/display.h>
-
-class OrientationReadingEvent : public QEvent {
- public:
-  OrientationReadingEvent(QEvent::Type type, QOrientationReading::Orientation orientation)
-      : QEvent(type)
-      , orientation_(orientation) {
-    DLOG("OrientationReadingEvent::OrientationReadingEvent()");
-  }
-  ~OrientationReadingEvent() {
-    DLOG("OrientationReadingEvent::~OrientationReadingEvent()");
-  }
-  static const QEvent::Type type_;
-  QOrientationReading::Orientation orientation_;
-};
-
-const QEvent::Type OrientationReadingEvent::type_ =
-    static_cast<QEvent::Type>(QEvent::registerEventType());
-
-// Grid unit used if GRID_UNIT_PX is not in the environment.
-const int kDefaultGridUnit = 8;
-
-// Size of the side stage in grid units.
-// FIXME(loicm) Hard-coded to 40 grid units for now.
-const int kSideStageWidth = 40;
-
-// Lifted from shell to determine form factor
-const int kTabletMinSize = 100;
-
-QUbuntuScreen::QUbuntuScreen(UApplicationOptions *options) {
-  // Retrieve units from the environment.
-  int gridUnit = kDefaultGridUnit;
-  QByteArray gridUnitString = qgetenv("GRID_UNIT_PX");
-  if (!gridUnitString.isEmpty()) {
-    bool ok;
-    gridUnit = gridUnitString.toInt(&ok);
-    if (!ok) {
-      gridUnit = kDefaultGridUnit;
-    }
-  }
-  gridUnit_ = gridUnit;
-  densityPixelRatio_ = static_cast<float>(gridUnit) / kDefaultGridUnit;
-  DLOG("grid unit is %d", gridUnit);
-  DLOG("density pixel ratio is %.2f", densityPixelRatio_);
-
-  // Compute menubar strut.
-  // FIXME(loicm) Hard-coded to 3 grid units plus 2 density independent pixels for now.
-  struct { int left; int right; int top; int bottom; } strut = {
-    0, 0, gridUnitToPixel(3) + densityPixelToPixel(2), 0
-  };
-  DLOG("menu bar height is %d pixels", strut.top);
-
-  // Get screen resolution.
-  UAUiDisplay* display = ua_ui_display_new_with_index(0);
-  const int kScreenWidth = ua_ui_display_query_horizontal_res(display);
-  const int kScreenHeight = ua_ui_display_query_vertical_res(display);
-  ASSERT(kScreenWidth > 0 && kScreenHeight > 0);
-  DLOG("screen resolution: %dx%d", kScreenWidth, kScreenHeight);
-  ua_ui_display_destroy(display);
-
-  // Store geometries depending on the stage hint.
-  UAUiStage kStageHint = static_cast<UAUiStage>(u_application_options_get_stage(options));
-  if (kScreenWidth/gridUnit < kTabletMinSize)
-    kStageHint = U_MAIN_STAGE;
-
-  DASSERT(kStageHint == U_MAIN_STAGE || kStageHint == U_SIDE_STAGE);
-  if (kStageHint != U_SIDE_STAGE) {
-    geometry_ = QRect(0, 0, kScreenWidth, kScreenHeight);
-    availableGeometry_ = QRect(
-        strut.left, strut.top, kScreenWidth - strut.left - strut.right,
-        kScreenHeight - strut.top - strut.bottom);
-  } else {
-    const int kSideStageWidthPixels = gridUnitToPixel(kSideStageWidth);
-    geometry_ = QRect(kScreenWidth - kSideStageWidthPixels, 0, kSideStageWidthPixels,
-                      kScreenHeight);
-    availableGeometry_ = QRect(
-        kScreenWidth - kSideStageWidthPixels + strut.left, strut.top,
-        kSideStageWidthPixels - strut.left - strut.right, kScreenHeight - strut.top - strut.bottom);
-  }
-
-  DLOG("QUbuntuScreen::QUbuntuScreen (this=%p)", this);
-
-  // Set the default orientation based on the initial screen dimmensions.
-  nativeOrientation_ = (availableGeometry_.width() >= availableGeometry_.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
-
-  // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
-  currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
-
-  orientationSensor_ = new QOrientationSensor();
-  QObject::connect(orientationSensor_, SIGNAL(readingChanged()), this, SLOT(onOrientationReadingChanged()));
-  orientationSensor_->start();
-}
-
-QUbuntuScreen::~QUbuntuScreen() {
-  DLOG("QUbuntuScreen::~QUbuntuScreen");
-
-  delete orientationSensor_;
-}
-
-void QUbuntuScreen::toggleSensors(bool enable) const {
-  DLOG("QUbuntuScreen::toggleSensors (this=%p, enable=%d)", this, enable);
-  if (enable)
-      orientationSensor_->start();
-  else
-      orientationSensor_->stop();
-}
-
-int QUbuntuScreen::gridUnitToPixel(int value) const {
-  DLOG("QUbuntuScreen::gridUnitToPixel (this=%p, value=%d)", this, value);
-  return value * gridUnit_;
-}
-
-int QUbuntuScreen::densityPixelToPixel(int value) const {
-  DLOG("QUbuntuScreen::densityPixelToPixel (this=%p, value=%d)", this, value);
-  if (value <= 2) {
-    // For values under 2dp, return only multiples of the value.
-    return static_cast<int>(value * qFloor(densityPixelRatio_));
-  } else {
-    return static_cast<int>(qRound(value * densityPixelRatio_));
-  }
-}
-
-void QUbuntuScreen::customEvent(QEvent* event) {
-  DLOG("QUbuntuScreen::customEvent (event: %p)", event);
-  DASSERT(QThread::currentThread() == thread());
-
-  OrientationReadingEvent* oReadingEvent = static_cast<OrientationReadingEvent*>(event);
-  switch (oReadingEvent->orientation_) {
-    case QOrientationReading::LeftUp: {
-      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
-          Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
-      break;
-    }
-    case QOrientationReading::TopUp: {
-      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
-          Qt::LandscapeOrientation : Qt::PortraitOrientation;
-      break;
-    }
-    case QOrientationReading::RightUp: {
-      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
-          Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
-      break;
-    }
-    case QOrientationReading::TopDown: {
-      currentOrientation_ = (nativeOrientation_ == Qt::LandscapeOrientation) ?
-          Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
-      break;
-    }
-    default: {
-      DLOG("Unknown orientation.");
-    }
-  }
-
-  // Raise the event signal so that client apps know the orientation changed
-  QWindowSystemInterface::handleScreenOrientationChange(screen(), currentOrientation_);
-}
-
-void QUbuntuScreen::onOrientationReadingChanged() {
-  DLOG("QUbuntuScreen::onOrientationReadingChanged");
-  DASSERT(orientationSensor_ != NULL);
-
-  // Make sure to switch to the main Qt thread context
-  QCoreApplication::postEvent(this, new OrientationReadingEvent(
-                                OrientationReadingEvent::type_, orientationSensor_->reading()->orientation()));
-}

=== removed file 'src/platforms/ubuntu/ubuntucommon/screen.h'
--- src/platforms/ubuntu/ubuntucommon/screen.h	2013-08-02 16:34:13 +0000
+++ src/platforms/ubuntu/ubuntucommon/screen.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUSCREEN_H
-#define QUBUNTUSCREEN_H
-
-#include "base/screen.h"
-#include <ubuntu/application/ui/options.h>
-
-#include <QObject>
-
-class QOrientationSensor;
-
-class QUbuntuScreen : public QObject, public QUbuntuBaseScreen {
-  Q_OBJECT
- public:
-  QUbuntuScreen(UApplicationOptions *options);
-  ~QUbuntuScreen();
-
-  // QPlatformScreen methods.
-  QRect geometry() const { return geometry_; }
-  QRect availableGeometry() const { return availableGeometry_; }
-
-  Qt::ScreenOrientation nativeOrientation() const { return nativeOrientation_; }
-  Qt::ScreenOrientation orientation() const { return currentOrientation_; }
-  int gridUnitToPixel(int value) const;
-  int densityPixelToPixel(int value) const;
-
-  void toggleSensors(bool enable) const;
-
-  // QObject methods.
-  void customEvent(QEvent* event);
-
- public Q_SLOTS:
-    void onOrientationReadingChanged();
-
- private:
-  QRect geometry_;
-  QRect availableGeometry_;
-  int gridUnit_;
-  float densityPixelRatio_;
-  Qt::ScreenOrientation nativeOrientation_;
-  Qt::ScreenOrientation currentOrientation_;
-  QOrientationSensor* orientationSensor_;
-};
-
-#endif  // QUBUNTUSCREEN_H

=== removed file 'src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro'
--- src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro	2013-11-22 15:24:44 +0000
+++ src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-TARGET = qubuntucommon
-TEMPLATE = lib
-
-QT += gui-private
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = integration.cc \
-          window.cc \
-          screen.cc \
-          input.cc \
-          clipboard.cc
-
-HEADERS = integration.h \
-          window.h \
-          screen.h \
-          input.h \
-          clipboard.h \
-          input_adaptor_factory.h
-
-CONFIG += static plugin create_prl link_prl
-
-INCLUDEPATH += ../../
-LIBS += -L../base -Wl,--whole-archive -lubuntubase -Wl,--no-whole-archive

=== removed file 'src/platforms/ubuntu/ubuntucommon/window.cc'
--- src/platforms/ubuntu/ubuntucommon/window.cc	2014-04-16 16:27:37 +0000
+++ src/platforms/ubuntu/ubuntucommon/window.cc	1970-01-01 00:00:00 +0000
@@ -1,230 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
-
-// FIXME(loicm) The fullscreen API from Ubuntu Platform isn't good enough as we can't leave
-//     fullscreen. The current Ubuntu Platform fullscreen call allows the application manager to
-//     know the fullscreen state of an application, it's still the application responsibility to set
-//     the right surface geometry.
-
-#include "window.h"
-#include "screen.h"
-#include "input.h"
-#include "base/logging.h"
-#include <qpa/qwindowsysteminterface.h>
-#include <ubuntu/application/ui/window.h>
-#include <QRegion>
-
-static void eventCallback(void* context, const Event* event) {
-  DLOG("eventCallback (context=%p, event=%p)", context, event);
-  DASSERT(context != NULL);
-  QUbuntuWindow* window = static_cast<QUbuntuWindow*>(context);
-  window->input_->postEvent(window->window(), event);
-}
-
-QUbuntuWindow::QUbuntuWindow(
-    QWindow* w, QUbuntuScreen* screen, QUbuntuInput* input,
-    bool systemSession, UApplicationInstance* instance, bool isShell)
-    : QUbuntuBaseWindow(w, screen)
-    , input_(input)
-    , state_(window()->windowState())
-    , systemSession_(systemSession)
-    , uainstance_(instance)
-    , screen_(screen)
-    , isShell_(isShell)
-    , exposed_(false)
-{
-  if (!systemSession) {
-    // Non-system sessions can't resize the window geometry.
-    geometry_ = screen->availableGeometry();
-  } else {
-    // Use client geometry if set explicitly, use available screen geometry otherwise.
-    geometry_ = window()->geometry() != screen->geometry() ?
-        window()->geometry() : screen->availableGeometry();
-  }
-  createWindow();
-  DLOG("QUbuntuWindow::QUbuntuWindow (this=%p, w=%p, screen=%p, input=%p)", this, w, screen, input);
-}
-
-QUbuntuWindow::~QUbuntuWindow() {
-  DLOG("QUbuntuWindow::~QUbuntuWindow");
-  destroyEGLSurface();
-  ua_ui_window_destroy(window_);
-}
-
-void QUbuntuWindow::createWindow() {
-  DLOG("QUbuntuWindow::createWindow (this=%p)", this);
-
-  // Get surface role and flags.
-  QVariant roleVariant = window()->property("role");
-  int role = roleVariant.isValid() ? roleVariant.toUInt() : 1;  // 1 is the default role for apps.
-  QVariant opaqueVariant = window()->property("opaque");
-  uint flags = opaqueVariant.isValid() ?
-      opaqueVariant.toUInt() ? static_cast<uint>(IS_OPAQUE_FLAG) : 0 : 0;
-  if (!systemSession_) {
-    // FIXME(loicm) Opaque flag is forced for now for non-system sessions (applications) for
-    //     performance reasons.
-    flags |= static_cast<uint>(IS_OPAQUE_FLAG);
-  }
-
-  const QByteArray title = (!window()->title().isNull()) ? window()->title().toUtf8() : "Window 1"; // legacy title
-
-#if !defined(QT_NO_DEBUG)
-  //ASSERT(role <= ON_SCREEN_KEYBOARD_ACTOR_ROLE);
-  const char* const roleString[] = {
-    "Dash", "Default", "Indicator", "Notifications", "Greeter", "Launcher", "OSK", "ShutdownDialog"
-  };
-  LOG("role: '%s'", roleString[role]);
-  LOG("flags: '%s'", (flags & static_cast<uint>(1)) ? "Opaque" : "NotOpaque");
-  LOG("title: '%s'", title.constData());
-#endif
-
-  // Get surface geometry.
-  QRect geometry;
-  if (state_ == Qt::WindowFullScreen) {
-    geometry = screen()->geometry();
-  } else if (state_ == Qt::WindowMaximized) {
-    geometry = screen()->availableGeometry();
-  } else {
-    geometry = geometry_;
-  }
-
-  fprintf(stderr, "creating surface at (%d, %d) with size (%d, %d) with title '%s'", geometry.x(), geometry.y(),
-          geometry.width(), geometry.height(), title.data());
-
-  // Setup platform window creation properties
-  wprops_ = ua_ui_window_properties_new_for_normal_window();
-  ua_ui_window_properties_set_titlen(wprops_, title.data(), title.size());
-  ua_ui_window_properties_set_role(wprops_, static_cast<UAUiWindowRole>(role));
-  ua_ui_window_properties_set_input_cb_and_ctx(wprops_, &eventCallback, this);
-  ua_ui_window_properties_set_dimensions(wprops_, geometry.width(), geometry.height());
-
-  // Create platform window
-  window_ = ua_ui_window_new_for_application_with_properties(uainstance_, wprops_);
-
-  if (geometry.width() != 0 || geometry.height() != 0)
-      ua_ui_window_resize(window_, geometry.width(), geometry.height());
-
-  if (geometry.x() != 0 || geometry.y() != 0)
-      ua_ui_window_move(window_, geometry.x(), geometry.y());
-
-  ASSERT(window_ != NULL);
-  createEGLSurface(ua_ui_window_get_native_type(window_));
-  if (state_ == Qt::WindowFullScreen) {
-    ua_ui_window_request_fullscreen(window_);
-  }
-
-  // Tell Qt about the geometry.
-  QWindowSystemInterface::handleGeometryChange(window(), geometry);
-  QPlatformWindow::setGeometry(geometry);
-}
-
-void QUbuntuWindow::moveResize(const QRect& rect) {
-  fprintf(stderr, "\nQUbuntuWindow::moveResize (this=%p, x=%d, y=%d, w=%d, h=%d)\n", this, rect.x(), rect.y(),
-       rect.width(), rect.height());
-  ua_ui_window_move(window_, rect.x(), rect.y());
-  ua_ui_window_resize(window_, rect.width(), rect.height());
-  QWindowSystemInterface::handleGeometryChange(window(), rect);
-  QPlatformWindow::setGeometry(rect);
-}
-
-void QUbuntuWindow::setWindowState(Qt::WindowState state) {
-  DLOG("QUbuntuWindow::setWindowState (this=%p, state=%d)", this, state);
-  if (state == state_)
-    return;
-
-  switch (state) {
-    case Qt::WindowNoState: {
-      DLOG("setting window state: 'NoState'");
-      moveResize(geometry_);
-      state_ = Qt::WindowNoState;
-      break;
-    }
-    case Qt::WindowFullScreen: {
-      DLOG("setting window state: 'FullScreen'");
-      ua_ui_window_request_fullscreen(window_);
-      moveResize(screen()->geometry());
-      state_ = Qt::WindowFullScreen;
-      break;
-    }
-    case Qt::WindowMaximized: {
-      DLOG("setting window state: 'Maximized'");
-      moveResize(screen()->availableGeometry());
-      state_ = Qt::WindowMaximized;
-      break;
-    }
-    case Qt::WindowActive:
-    case Qt::WindowMinimized:
-    default: {
-      DLOG("setting window state: 'Active|Minimized'");
-      break;
-    }
-  }
-}
-
-void QUbuntuWindow::setGeometry(const QRect& rect) {
-  fprintf(stderr, "QUbuntuWindow::setGeometry (this=%p)", this);
-  if (systemSession_) {
-    // Non-system sessions can't resize the window geometry.
-    geometry_ = rect;
-    if (state_ != Qt::WindowFullScreen && state_ != Qt::WindowMaximized)
-      moveResize(rect);
-  }
-}
-
-void QUbuntuWindow::setVisible(bool visible) {
-  DLOG("QUbuntuWindow::setVisible (this=%p, visible=%s)", this, visible ? "true" : "false");
-  if (isShell_ == false)
-    screen_->toggleSensors(visible);
-
-  setExposed(visible);
-
-  if (visible) {
-    ua_ui_window_show(window_);
-  } else {
-    ua_ui_window_hide(window_);
-  }
-}
-
-bool QUbuntuWindow::isExposed() const {
-  return exposed_;
-}
-
-void QUbuntuWindow::setExposed(const bool exposed) {
-  DLOG("QUbuntuWindow::setExposed (this=%p, exposed=%s)", this, exposed ? "true" : "false");
-
-  if (exposed_ == exposed)
-    return;
-
-  exposed_ = exposed;
-  if (exposed_) {
-    QWindowSystemInterface::handleExposeEvent(window(), geometry());
-  } else {
-    QWindowSystemInterface::handleExposeEvent(window(), QRect());
-  }
-}
-
-void QUbuntuWindow::windowEvent(QEvent *event) {
-  if (event->type() == QEvent::Expose) {
-    QRegion region = static_cast<QExposeEvent *>(event)->region();
-
-    if (region.isEmpty()) {
-      // hiding window causes Qt to release the GL context and its resources, which is a bit severe
-      // Instead can use the exposure system to stop the rendering loop, but hold onto the resources
-      setExposed(false);
-    } else {
-      setExposed(true);
-    }
-  }
-}

=== removed file 'src/platforms/ubuntu/ubuntucommon/window.h'
--- src/platforms/ubuntu/ubuntucommon/window.h	2014-04-16 11:32:13 +0000
+++ src/platforms/ubuntu/ubuntucommon/window.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUWINDOW_H
-#define QUBUNTUWINDOW_H
-
-#include "base/window.h"
-#include <ubuntu/application/instance.h>
-#include <ubuntu/application/ui/window.h>
-
-#define IS_OPAQUE_FLAG 1
-
-class QUbuntuScreen;
-class QUbuntuInput;
-
-class QUbuntuWindow : public QUbuntuBaseWindow {
- public:
-  QUbuntuWindow(QWindow* w, QUbuntuScreen* screen, QUbuntuInput* input, bool systemSession, UApplicationInstance* instance, bool isShell);
-  ~QUbuntuWindow();
-
-  // QPlatformWindow methods.
-  void setGeometry(const QRect&);
-  void setWindowState(Qt::WindowState state);
-  void setVisible(bool visible);
-  bool isExposed() const;
-  void windowEvent(QEvent *event);
-
-  QUbuntuInput* input_;
-
- private:
-  void createWindow();
-  void moveResize(const QRect& rect);
-  void setExposed(const bool exposed);
-
-  UAUiWindow* window_;
-  Qt::WindowState state_;
-  QRect geometry_;
-  bool systemSession_;
-  UApplicationInstance* uainstance_;
-  UAUiWindowProperties* wprops_;
-  QUbuntuScreen* screen_;
-  bool isShell_;
-  bool exposed_;
-};
-
-#endif  // QUBUNTUWINDOW_H

=== removed directory 'src/platforms/ubuntu/ubuntumir'
=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumir.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumir.pro	2013-06-21 17:48:36 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumir.pro	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-TEMPLATE = subdirs
-
-mirclient|mirserver{
-SUBDIRS += ubuntumircommon
-}
-
-mirclient {
-SUBDIRS += ubuntumirclient
-}
-mirserver {
-SUBDIRS += ubuntumirserver
-}
-
-ubuntumirclient.depends = ubuntumircommon
-ubuntumirserver.depends = ubuntumircommon
-

=== removed directory 'src/platforms/ubuntu/ubuntumir/ubuntumirclient'
=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	2014-05-29 10:28:33 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-TARGET = qubuntumirclient
-TEMPLATE = lib
-
-QT += gui-private platformsupport-private sensors
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = main.cc 
-
-CONFIG += plugin link_prl link_pkgconfig
-
-PKGCONFIG += egl
-INCLUDEPATH += ../../../ ../../ ../
-LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api
-
-OTHER_FILES += ubuntumirclient.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target

=== removed directory 'src/platforms/ubuntu/ubuntumir/ubuntumircommon'
=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	2013-10-15 21:50:17 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "input.h"
-#include "integration.h"
-#include "base/logging.h"
-
-#include <QtCore/qglobal.h>
-#include <QtCore/QCoreApplication>
-#include <private/qguiapplication_p.h>
-#include <qpa/qplatforminputcontext.h>
-#include <qpa/qwindowsysteminterface.h>
-
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
-
-#include <ubuntu/application/ui/input/event.h>
-
-// XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
-static const uint32_t KeyTable[] = {
-  XKB_KEY_Escape,                  Qt::Key_Escape,
-  XKB_KEY_Tab,                     Qt::Key_Tab,
-  XKB_KEY_ISO_Left_Tab,            Qt::Key_Backtab,
-  XKB_KEY_BackSpace,               Qt::Key_Backspace,
-  XKB_KEY_Return,                  Qt::Key_Return,
-  XKB_KEY_Insert,                  Qt::Key_Insert,
-  XKB_KEY_Delete,                  Qt::Key_Delete,
-  XKB_KEY_Clear,                   Qt::Key_Delete,
-  XKB_KEY_Pause,                   Qt::Key_Pause,
-  XKB_KEY_Print,                   Qt::Key_Print,
-
-  XKB_KEY_Home,                    Qt::Key_Home,
-  XKB_KEY_End,                     Qt::Key_End,
-  XKB_KEY_Left,                    Qt::Key_Left,
-  XKB_KEY_Up,                      Qt::Key_Up,
-  XKB_KEY_Right,                   Qt::Key_Right,
-  XKB_KEY_Down,                    Qt::Key_Down,
-  XKB_KEY_Prior,                   Qt::Key_PageUp,
-  XKB_KEY_Next,                    Qt::Key_PageDown,
-
-  XKB_KEY_Shift_L,                 Qt::Key_Shift,
-  XKB_KEY_Shift_R,                 Qt::Key_Shift,
-  XKB_KEY_Shift_Lock,              Qt::Key_Shift,
-  XKB_KEY_Control_L,               Qt::Key_Control,
-  XKB_KEY_Control_R,               Qt::Key_Control,
-  XKB_KEY_Meta_L,                  Qt::Key_Meta,
-  XKB_KEY_Meta_R,                  Qt::Key_Meta,
-  XKB_KEY_Alt_L,                   Qt::Key_Alt,
-  XKB_KEY_Alt_R,                   Qt::Key_Alt,
-  XKB_KEY_Caps_Lock,               Qt::Key_CapsLock,
-  XKB_KEY_Num_Lock,                Qt::Key_NumLock,
-  XKB_KEY_Scroll_Lock,             Qt::Key_ScrollLock,
-  XKB_KEY_Super_L,                 Qt::Key_Super_L,
-  XKB_KEY_Super_R,                 Qt::Key_Super_R,
-  XKB_KEY_Menu,                    Qt::Key_Menu,
-  XKB_KEY_Hyper_L,                 Qt::Key_Hyper_L,
-  XKB_KEY_Hyper_R,                 Qt::Key_Hyper_R,
-  XKB_KEY_Help,                    Qt::Key_Help,
-
-  XKB_KEY_KP_Space,                Qt::Key_Space,
-  XKB_KEY_KP_Tab,                  Qt::Key_Tab,
-  XKB_KEY_KP_Enter,                Qt::Key_Enter,
-  XKB_KEY_KP_Home,                 Qt::Key_Home,
-  XKB_KEY_KP_Left,                 Qt::Key_Left,
-  XKB_KEY_KP_Up,                   Qt::Key_Up,
-  XKB_KEY_KP_Right,                Qt::Key_Right,
-  XKB_KEY_KP_Down,                 Qt::Key_Down,
-  XKB_KEY_KP_Prior,                Qt::Key_PageUp,
-  XKB_KEY_KP_Next,                 Qt::Key_PageDown,
-  XKB_KEY_KP_End,                  Qt::Key_End,
-  XKB_KEY_KP_Begin,                Qt::Key_Clear,
-  XKB_KEY_KP_Insert,               Qt::Key_Insert,
-  XKB_KEY_KP_Delete,               Qt::Key_Delete,
-  XKB_KEY_KP_Equal,                Qt::Key_Equal,
-  XKB_KEY_KP_Multiply,             Qt::Key_Asterisk,
-  XKB_KEY_KP_Add,                  Qt::Key_Plus,
-  XKB_KEY_KP_Separator,            Qt::Key_Comma,
-  XKB_KEY_KP_Subtract,             Qt::Key_Minus,
-  XKB_KEY_KP_Decimal,              Qt::Key_Period,
-  XKB_KEY_KP_Divide,               Qt::Key_Slash,
-
-  XKB_KEY_ISO_Level3_Shift,        Qt::Key_AltGr,
-  XKB_KEY_Multi_key,               Qt::Key_Multi_key,
-  XKB_KEY_Codeinput,               Qt::Key_Codeinput,
-  XKB_KEY_SingleCandidate,         Qt::Key_SingleCandidate,
-  XKB_KEY_MultipleCandidate,       Qt::Key_MultipleCandidate,
-  XKB_KEY_PreviousCandidate,       Qt::Key_PreviousCandidate,
-
-  XKB_KEY_Mode_switch,             Qt::Key_Mode_switch,
-  XKB_KEY_script_switch,           Qt::Key_Mode_switch,
-  XKB_KEY_XF86AudioRaiseVolume,    Qt::Key_VolumeUp,
-  XKB_KEY_XF86AudioLowerVolume,    Qt::Key_VolumeDown,
-  XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
-  XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
-
-  0,                          0
-};
-
-QUbuntuMirInput::QUbuntuMirInput(QUbuntuIntegration* integration)
-  : QUbuntuInput(integration) {
-}
-
-QUbuntuMirInput::~QUbuntuMirInput() {
-}
-
-static uint32_t translateKeysym(uint32_t sym, char *string, size_t size) {
-  Q_UNUSED(size);
-  string[0] = '\0';
-
-  if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35)
-    return Qt::Key_F1 + (int(sym) - XKB_KEY_F1);
-
-  for (int i = 0; KeyTable[i]; i += 2)
-    if (sym == KeyTable[i])
-      return KeyTable[i + 1];
-
-  string[0] = sym;
-  string[1] = '\0';
-  return toupper(sym);
-}
-
-void QUbuntuMirInput::dispatchKeyEvent(QWindow* window, const void* ev) {
-  DLOG("QUbuntuBaseInput::dispatchKeyEvent (this=%p, window=%p, event=%p)", this, window, ev);
-  const Event* event = reinterpret_cast<const Event*>(ev);
-
-#if (LOG_EVENTS != 0)
-  // Key event logging.
-  LOG("KEY device_id:%d source_id:%d action:%d flags:%d meta_state:%d key_code:%d "
-      "scan_code:%d repeat_count:%d down_time:%lld event_time:%lld is_system_key:%d",
-      event->device_id, event->source_id, event->action, event->flags, event->meta_state,
-      event->details.key.key_code, event->details.key.scan_code,
-      event->details.key.repeat_count, event->details.key.down_time,
-      event->details.key.event_time, event->details.key.is_system_key);
-#endif
-
-  ulong timestamp = event->details.key.event_time / 1000000;
-  xkb_keysym_t xk_sym = (xkb_keysym_t)event->details.key.key_code;
-
-  // Key modifier and unicode index mapping.
-  const int kMetaState = event->meta_state;
-  Qt::KeyboardModifiers modifiers = Qt::NoModifier;
-  if (kMetaState & U_KEY_MODIFIER_SHIFT) {
-    modifiers |= Qt::ShiftModifier;
-  }
-  if (kMetaState & U_KEY_MODIFIER_CTRL) {
-    modifiers |= Qt::ControlModifier;
-  }
-  if (kMetaState & U_KEY_MODIFIER_ALT) {
-    modifiers |= Qt::AltModifier;
-  }
-  if (kMetaState & U_KEY_MODIFIER_META) {
-    modifiers |= Qt::MetaModifier;
-  }
-
-  QEvent::Type keyType = event->action == U_KEY_ACTION_DOWN ? QEvent::KeyPress : QEvent::KeyRelease;
-
-  char s[2];
-  int sym = translateKeysym(xk_sym, s, sizeof(s));
-  QString text = QString::fromLatin1(s);
-
-  QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
-  if (context) {
-    QKeyEvent qKeyEvent(keyType, sym, modifiers, text);
-    qKeyEvent.setTimestamp(timestamp);
-    if (context->filterEvent(&qKeyEvent)) {
-      DLOG("key event filtered out by input context");
-      return;
-    }
-  }
-
-  handleKeyEvent(window, timestamp, keyType, sym, modifiers, text);
-}

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h	2013-06-24 15:58:01 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTU_MIR_INPUT_H
-#define QUBUNTU_MIR_INPUT_H
-
-#include "ubuntucommon/input.h"
-
-class QUbuntuIntegration;
-
-class QUbuntuMirInput : public QUbuntuInput {
-public:
-  QUbuntuMirInput(QUbuntuIntegration* integration);
-  ~QUbuntuMirInput();
-  
-  virtual void dispatchKeyEvent(QWindow* window, const void* event);
-};
-
-#endif  // QUBUNTU_MIR_INPUT_H

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc	2013-06-24 17:52:59 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "input.h"
-#include "integration.h"
-#include "ubuntucommon/input_adaptor_factory.h"
-
-namespace
-{
-struct InputAdaptorFactory : public QUbuntuInputAdaptorFactory {
-  InputAdaptorFactory() {}
-  ~InputAdaptorFactory() {}
-    
-  QUbuntuInput *create_input_adaptor(QUbuntuIntegration* integration)
-  {
-    return new QUbuntuMirInput(integration);
-  }
-  static InputAdaptorFactory* instance()
-  {
-    static InputAdaptorFactory global_instance;
-    return &global_instance;
-  }
-};
-}
-
-QUbuntuMirIntegration::QUbuntuMirIntegration()
-  : QUbuntuIntegration(InputAdaptorFactory::instance()) {
-}
-
-QUbuntuMirIntegration::~QUbuntuMirIntegration() {
-}

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h	2013-06-21 20:46:06 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTU_MIR_INTEGRATION_H
-#define QUBUNTU_MIR_INTEGRATION_H
-
-#include "ubuntucommon/integration.h"
-
-class QUbuntuMirIntegration : public QUbuntuIntegration {
-public:
-  QUbuntuMirIntegration();
-  ~QUbuntuMirIntegration();
-};
-
-#endif  // QUBUNTU_MIR_INTEGRATION_H

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro	2013-11-22 15:24:44 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-TARGET = qubuntumircommon
-TEMPLATE = lib
-
-QT += core-private gui-private
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined -L../ubuntucommon
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = input.cc integration.cc
-
-HEADERS = input.h integration.h
-
-CONFIG += static plugin create_prl link_prl
-
-INCLUDEPATH += ../../../ ../../
-LIBS += -Wl,--whole-archive -lqubuntucommon -Wl,--no-whole-archive

=== removed directory 'src/platforms/ubuntu/ubuntumir/ubuntumirserver'
=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	2014-05-29 10:28:33 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 <qpa/qplatformintegrationplugin.h>
-#include "ubuntumircommon/integration.h"
-
-QT_BEGIN_NAMESPACE
-
-class QUbuntuMirServerIntegrationPlugin : public QPlatformIntegrationPlugin {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid
-                    FILE "ubuntumirserver.json")
-
- public:
-  QStringList keys() const;
-  QPlatformIntegration* create(const QString&, const QStringList&);
-};
-
-QStringList QUbuntuMirServerIntegrationPlugin::keys() const {
-  QStringList list;
-  list << "ubuntumirserver";
-  return list;
-}
-
-QPlatformIntegration* QUbuntuMirServerIntegrationPlugin::create(
-    const QString& system, const QStringList& paramList) {
-  Q_UNUSED(paramList);
-  if (system.toLower() == "ubuntumirserver") {
-#ifdef PLATFORM_API_TOUCH
-    setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirserver", 1);
-#else
-    setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirserver", 1);
-#endif
-    return new QUbuntuMirIntegration();
-  }
-  return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json	2013-06-10 20:48:03 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "ubuntumirserver" ]
-}

=== removed file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	2014-05-29 10:28:33 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-TARGET = qubuntumirserver
-TEMPLATE = lib
-
-QT += gui-private platformsupport-private sensors
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = main.cc 
-
-CONFIG += plugin link_prl link_pkgconfig
-
-PKGCONFIG += egl
-INCLUDEPATH += ../../../ ../../ ../
-LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api
-
-OTHER_FILES += ubuntu.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target

=== removed directory 'src/platforms/ubuntulegacy'
=== removed file 'src/platforms/ubuntulegacy/input.cc'
--- src/platforms/ubuntulegacy/input.cc	2013-10-17 18:38:03 +0000
+++ src/platforms/ubuntulegacy/input.cc	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "input.h"
-#include "integration.h"
-#include "base/logging.h"
-#include <qpa/qplatformwindow.h>
-
-static void eventCallback(Event* event, void* context) {
-  DLOG("eventCallback (event=%p, context=%p)", event, context);
-  QUbuntuLegacyInput* input = static_cast<QUbuntuLegacyInput*>(context);
-  if (!input->stopping_.testAndSetRelease(1, 1)) {
-    // FIXME(loicm) We need to be able to retrieve the window from an event in order to support
-    //     multiple surfaces.
-    QPlatformWindow* window = static_cast<QUbuntuLegacyIntegration*>(
-        input->integration())->platformWindow();
-    if (window) {
-      input->postEvent(window->window(), event);
-    }
-  }
-}
-
-QUbuntuLegacyInput::QUbuntuLegacyInput(QUbuntuLegacyIntegration* integration)
-    : QUbuntuBaseInput(integration)
-    , stopping_(0) {
-  config_.enable_touch_point_visualization = false;
-  config_.default_layer_for_touch_point_visualization = 1;
-  listener_.on_new_event = eventCallback;
-  listener_.context = this;
-  DLOG("initializing input stack");
-  android_input_stack_initialize(&listener_, &config_);
-  DLOG("starting input stack");
-  android_input_stack_start();
-  DLOG("QUbuntuLegacyInput::QUbuntuLegacyInput (this=%p, integration=%p)", this, integration);
-}
-
-QUbuntuLegacyInput::~QUbuntuLegacyInput() {
-  DLOG("QUbuntuLegacyInput::~QUbuntuLegacyInput");
-  stopping_.fetchAndStoreRelease(1);
-  DLOG("stopping input stack");
-  android_input_stack_stop();
-  DLOG("shutting down input stack");
-  android_input_stack_shutdown();
-}

=== removed file 'src/platforms/ubuntulegacy/input.h'
--- src/platforms/ubuntulegacy/input.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/input.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTULEGACYINPUT_H
-#define QUBUNTULEGACYINPUT_H
-
-#include "base/input.h"
-#include <cstring>  // input_stack_compatibility_layer.h needs this for size_t.
-#include <input/input_stack_compatibility_layer.h>
-
-class QUbuntuLegacyIntegration;
-
-class QUbuntuLegacyInput : public QUbuntuBaseInput {
- public:
-  QUbuntuLegacyInput(QUbuntuLegacyIntegration* integration);
-  ~QUbuntuLegacyInput();
-
-  QAtomicInt stopping_;
-
- private:
-  InputStackConfiguration config_;
-  AndroidEventListener listener_;
-};
-
-#endif  // QUBUNTULEGACYINPUT_H

=== removed file 'src/platforms/ubuntulegacy/integration.cc'
--- src/platforms/ubuntulegacy/integration.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/integration.cc	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "integration.h"
-#include "window.h"
-#include "input.h"
-#include "base/clipboard.h"
-#include "base/logging.h"
-#include <qpa/qplatforminputcontextfactory_p.h>
-#include <qpa/qplatforminputcontext.h>
-#include <QTimer>
-
-// That value seems to work on every systems and applications tested so far.
-static const int kInputDelay = 1000;
-
-QUbuntuLegacyIntegration::QUbuntuLegacyIntegration()
-    : window_(NULL)
-    , screen_(new QUbuntuLegacyScreen())
-    , input_(NULL)
-    , clipboard_(new QUbuntuBaseClipboard()) {
-  screenAdded(screen_);
-  if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_INPUT")) {
-    // Input initialization needs to be delayed in order to avoid crashes in the input stack.
-    int delay = kInputDelay;
-    QByteArray swapIntervalString = qgetenv("QTUBUNTU_INPUT_DELAY");
-    if (!swapIntervalString.isEmpty()) {
-      bool valid;
-      delay = qMax(1, swapIntervalString.toInt(&valid));
-      if (!valid)
-        delay = kInputDelay;
-    }
-    DLOG("delaying input initialization for %d ms", delay);
-    QTimer::singleShot(delay, this, SLOT(initInput()));
-  }
-  DLOG("QUbuntuLegacyIntegration::QUbuntuLegacyIntegration (this=%p)", this);
-}
-
-QUbuntuLegacyIntegration::~QUbuntuLegacyIntegration() {
-  DLOG("QUbuntuLegacyIntegration::~QUbuntuLegacyIntegration");
-  delete clipboard_;
-  delete input_;
-  delete inputContext_;
-  delete screen_;
-}
-
-void QUbuntuLegacyIntegration::initInput() {
-  DLOG("QUbuntuLegacyIntegration::initInput (this=%p)", this);
-  input_ = new QUbuntuLegacyInput(this);
-  inputContext_ = QPlatformInputContextFactory::create();
-}
-
-QPlatformWindow* QUbuntuLegacyIntegration::createPlatformWindow(QWindow* window) const {
-  DLOG("QUbuntuLegacyIntegration::createPlatformWindow const (this=%p, window=%p)", this, window);
-  return const_cast<QUbuntuLegacyIntegration*>(this)->createPlatformWindow(window);
-}
-
-QPlatformWindow* QUbuntuLegacyIntegration::createPlatformWindow(QWindow* window) {
-  DLOG("QUbuntuLegacyIntegration::createPlatformWindow (this=%p, window=%p)", this, window);
-  ASSERT(window_ == NULL);  // FIXME(loicm) Multiple windows are not supported yet.
-  window_ = new QUbuntuLegacyWindow(window, static_cast<QUbuntuLegacyScreen*>(screen_));
-  window_->requestActivateWindow();
-  return window_;
-}

=== removed file 'src/platforms/ubuntulegacy/integration.h'
--- src/platforms/ubuntulegacy/integration.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/integration.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTULEGACYINTEGRATION_H
-#define QUBUNTULEGACYINTEGRATION_H
-
-#include "base/integration.h"
-#include "screen.h"
-
-class QUbuntuLegacyInput;
-
-class QUbuntuLegacyIntegration : public QObject, public QUbuntuBaseIntegration {
-  Q_OBJECT
-
- public:
-  QUbuntuLegacyIntegration();
-  ~QUbuntuLegacyIntegration();
-
-  // QPlatformIntegration methods.
-  QPlatformWindow* createPlatformWindow(QWindow* window) const;
-  QPlatformWindow* createPlatformWindow(QWindow* window);
-  QPlatformInputContext* inputContext() const { return inputContext_; }
-  QPlatformClipboard* clipboard() const { return clipboard_; }
-
-  // New methods.
-  // FIXME(loicm) Only one window can be created for now, remove that function when adding support
-  //     for multiple windows.
-  QPlatformWindow* platformWindow() const { return window_; }
-
- private slots:
-  void initInput();
-
- private:
-  QPlatformWindow* window_;
-  QPlatformScreen* screen_;
-  QUbuntuLegacyInput* input_;
-  QPlatformInputContext* inputContext_;
-  QPlatformClipboard* clipboard_;
-};
-
-#endif  // QUBUNTULEGACYINTEGRATION_H

=== removed file 'src/platforms/ubuntulegacy/main.cc'
--- src/platforms/ubuntulegacy/main.cc	2013-11-19 09:00:47 +0000
+++ src/platforms/ubuntulegacy/main.cc	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 <qpa/qplatformintegrationplugin.h>
-#include "integration.h"
-
-QT_BEGIN_NAMESPACE
-
-class QUbuntuLegacyIntegrationPlugin : public QPlatformIntegrationPlugin {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid
-                    FILE "ubuntulegacy.json")
-
- public:
-  QStringList keys() const;
-  QPlatformIntegration* create(const QString&, const QStringList&);
-};
-
-QStringList QUbuntuLegacyIntegrationPlugin::keys() const {
-  QStringList list;
-  list << "ubuntulegacy";
-  return list;
-}
-
-QPlatformIntegration* QUbuntuLegacyIntegrationPlugin::create(
-    const QString& system, const QStringList& paramList) {
-  Q_UNUSED(paramList);
-  if (system.toLower() == "ubuntulegacy")
-    return new QUbuntuLegacyIntegration();
-  return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"

=== removed file 'src/platforms/ubuntulegacy/screen.cc'
--- src/platforms/ubuntulegacy/screen.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/screen.cc	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "screen.h"
-#include "base/logging.h"
-#include <surface_flinger/surface_flinger_compatibility_layer.h>
-
-QUbuntuLegacyScreen::QUbuntuLegacyScreen() {
-  const int kScreenWidth = sf_get_display_width(SURFACE_FLINGER_DEFAULT_DISPLAY_ID);
-  const int kScreenHeight = sf_get_display_height(SURFACE_FLINGER_DEFAULT_DISPLAY_ID);
-  ASSERT(kScreenWidth > 0 && kScreenHeight > 0);
-  geometry_ = QRect(0, 0, kScreenWidth, kScreenHeight);
-  ASSERT((sfClient_ = sf_client_create_full(false)) != NULL);
-  DLOG("QUbuntuLegacyScreen::QUbuntuLegacyScreen (this=%p)", this);
-}
-
-QUbuntuLegacyScreen::~QUbuntuLegacyScreen() {
-  DLOG("QUbuntuLegacyScreen::~QUbuntuLegacyScreen");
-  // FIXME(loicm) Invalid because the struct is forward declarated, we need a way to clean the
-  //     handle correctly.
-  // delete sfClient_;
-}

=== removed file 'src/platforms/ubuntulegacy/screen.h'
--- src/platforms/ubuntulegacy/screen.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/screen.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTULEGACYSCREEN_H
-#define QUBUNTULEGACYSCREEN_H
-
-#include "base/screen.h"
-
-struct SfClient;
-
-class QUbuntuLegacyScreen : public QUbuntuBaseScreen {
- public:
-  QUbuntuLegacyScreen();
-  ~QUbuntuLegacyScreen();
-
-  // QPlatformScreen methods.
-  QRect geometry() const { return geometry_; }
-
-  // New methods.
-  SfClient* sfClient() const { return sfClient_; }
-
- private:
-  QRect geometry_;
-  SfClient* sfClient_;
-};
-
-#endif  // QUBUNTULEGACYSCREEN_H

=== removed file 'src/platforms/ubuntulegacy/ubuntulegacy.json'
--- src/platforms/ubuntulegacy/ubuntulegacy.json	2013-01-17 19:51:06 +0000
+++ src/platforms/ubuntulegacy/ubuntulegacy.json	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "ubuntulegacy" ]
-}

=== removed file 'src/platforms/ubuntulegacy/ubuntulegacy.pro'
--- src/platforms/ubuntulegacy/ubuntulegacy.pro	2013-01-17 19:51:06 +0000
+++ src/platforms/ubuntulegacy/ubuntulegacy.pro	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-TARGET = qubuntulegacy
-TEMPLATE = lib
-
-QT += core-private gui-private platformsupport-private
-
-DEFINES += MESA_EGL_NO_X11_HEADERS
-QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -Wl,-no-undefined
-
-CONFIG(debug) {
-  QMAKE_CXXFLAGS_DEBUG += -Werror
-}
-
-SOURCES = main.cc \
-          integration.cc \
-          window.cc \
-          screen.cc \
-          input.cc
-
-HEADERS = integration.h \
-          window.h \
-          screen.h \
-          input.h
-
-CONFIG += plugin link_prl
-
-PRE_TARGETDEPS = ../base/libubuntubase.a
-
-INCLUDEPATH += .. /usr/include/hybris
-LIBS += -L../base -lubuntubase -lhybris_ics -lsf -lis
-
-OTHER_FILES += ubuntulegacy.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target

=== removed file 'src/platforms/ubuntulegacy/window.cc'
--- src/platforms/ubuntulegacy/window.cc	2013-10-09 12:11:20 +0000
+++ src/platforms/ubuntulegacy/window.cc	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 "window.h"
-#include "screen.h"
-#include "base/logging.h"
-#include <qpa/qwindowsysteminterface.h>
-#include <surface_flinger/surface_flinger_compatibility_layer.h>
-
-QUbuntuLegacyWindow::QUbuntuLegacyWindow(QWindow* w, QUbuntuLegacyScreen* screen)
-    : QUbuntuBaseWindow(w, screen)
-    , geometry_(window()->geometry())
-    , layer_((INT_MAX / 2) + winId()) {
-  // FIXME(loicm) SF compat set_size() function doesn't seem to work as expected, surfaces are
-  //     created fullscreen and never resized for now.
-  QRect screenGeometry(screen->availableGeometry());
-  SfSurfaceCreationParameters parameters = {
-    screenGeometry.x(), screenGeometry.y(), screenGeometry.width(), screenGeometry.height(), -1,
-    layer_, 1.0f, false, "QUbuntuLegacyWindow"
-  };
-  // SfSurfaceCreationParameters parameters = {
-  //   geometry_.x(), geometry_.y(), geometry_.width(), geometry_.height(), -1, layer_, 1.0f, false,
-  //   "QUbuntuLegacyWindow"
-  // };
-  ASSERT((sfSurface_ = sf_surface_create(screen->sfClient(), &parameters)) != NULL);
-  createEGLSurface(sf_surface_get_egl_native_window(sfSurface_));
-  setWindowState(window()->windowState());
-  DLOG("QUbuntuLegacyWindow::QUbuntuLegacyWindow (this=%p, w=%p, screen=%p)", this, w, screen);
-}
-
-QUbuntuLegacyWindow::~QUbuntuLegacyWindow() {
-  DLOG("QUbuntuLegacyWindow::~QUbuntuLegacyWindow");
-  destroyEGLSurface();
-  // FIXME(loicm) Invalid because the struct is forward declarated, we need a way to clean the
-  //     handle correctly.
-  // delete sfSurface_;
-}
-
-void QUbuntuLegacyWindow::setWindowState(Qt::WindowState state) {
-  if (state == state_)
-    return;
-
-  switch (state) {
-    case Qt::WindowNoState: {
-      DLOG("QUbuntuLegacyWindow::setWindowState (this=%p, state='NoState')", this);
-      moveResize(geometry_);
-      state_ = Qt::WindowNoState;
-      break;
-    }
-    case Qt::WindowFullScreen: {
-      DLOG("QUbuntuLegacyWindow::setWindowState (this=%p, state='FullScreen')", this);
-      QRect screenGeometry(screen()->availableGeometry());
-      moveResize(screenGeometry);
-      state_ = Qt::WindowFullScreen;
-      break;
-    }
-    case Qt::WindowActive:
-    case Qt::WindowMinimized:
-    case Qt::WindowMaximized:
-    default: {
-      DLOG("QUbuntuLegacyWindow::setWindowState (this=%p, state='Active|Minimized|Maximized')", this);
-      break;
-    }
-  }
-}
-
-void QUbuntuLegacyWindow::setGeometry(const QRect& rect) {
-  DLOG("QUbuntuLegacyWindow::setGeometry (this=%p)", this);
-  geometry_ = rect;
-  if (state_ != Qt::WindowFullScreen)
-    moveResize(rect);
-}
-
-void QUbuntuLegacyWindow::setOpacity(qreal level) {
-  DLOG("QUbuntuLegacyWindow::setOpacity (this=%p, level=%.2f)", this, level);
-  sf_client_begin_transaction(screen_->sfClient());
-  sf_surface_set_alpha(sfSurface_, level);
-  sf_client_end_transaction(screen_->sfClient());
-}
-
-void QUbuntuLegacyWindow::raise() {
-  DLOG("QUbuntuLegacyWindow::raise (this=%p)", this);
-  layer_ = qMax(0, qMin(layer_ + 1, INT_MAX));
-  sf_client_begin_transaction(screen_->sfClient());
-  sf_surface_set_layer(sfSurface_, layer_);
-  sf_client_end_transaction(screen_->sfClient());
-}
-
-void QUbuntuLegacyWindow::lower() {
-  DLOG("QUbuntuLegacyWindow::lower (this=%p)", this);
-  layer_ = qMax(0, qMin(layer_ - 1, INT_MAX));
-  sf_client_begin_transaction(screen_->sfClient());
-  sf_surface_set_alpha(sfSurface_, layer_);
-  sf_client_end_transaction(screen_->sfClient());
-}
-
-void QUbuntuLegacyWindow::moveResize(const QRect& rect) {
-  DLOG("QUbuntuLegacyWindow::moveResize (this=%p, x=%d, y=%d, w=%d, h=%d)", this, rect.x(),
-       rect.y(), rect.width(), rect.height());
-  // FIXME(loicm) SF compat set_size() function doesn't seem to work as expected, surfaces are
-  //     created fullscreen and never moved nor resized for now.
-  // sf_client_begin_transaction(screen_->sfClient());
-  // sf_surface_move_to(sfSurface_, rect.x(), rect.y());
-  // sf_surface_set_size(sfSurface_, rect.width(), rect.height());
-  // sf_client_end_transaction(screen_->sfClient());
-  QWindowSystemInterface::handleGeometryChange(window(), rect);
-  QPlatformWindow::setGeometry(rect);
-}

=== removed file 'src/platforms/ubuntulegacy/window.h'
--- src/platforms/ubuntulegacy/window.h	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntulegacy/window.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTULEGACYWINDOW_H
-#define QUBUNTULEGACYWINDOW_H
-
-#include "base/window.h"
-
-struct SfClient;
-struct SfSurface;
-class QUbuntuLegacyScreen;
-
-class QUbuntuLegacyWindow : public QUbuntuBaseWindow {
- public:
-  QUbuntuLegacyWindow(QWindow* w, QUbuntuLegacyScreen* screen);
-  ~QUbuntuLegacyWindow();
-
-  // QPlatformWindow methods.
-  void setGeometry(const QRect&);
-  void setWindowState(Qt::WindowState state);
-  void setOpacity(qreal level);
-  void raise();
-  void lower();
-
- private:
-  void moveResize(const QRect& rect);
-
-  QUbuntuLegacyScreen* screen_;
-  SfSurface* sfSurface_;
-  Qt::WindowState state_;
-  QRect geometry_;
-  int layer_;
-};
-
-#endif  // QUBUNTULEGACYWINDOW_H

=== modified file 'src/src.pro'
--- src/src.pro	2014-03-25 17:42:14 +0000
+++ src/src.pro	2014-07-21 23:47:35 +0000
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += platforms
+SUBDIRS += ubuntumirclient

=== renamed directory 'src/platforms/base' => 'src/ubuntumirclient'
=== renamed file 'src/platforms/base/backing_store.cc' => 'src/ubuntumirclient/backingstore.cpp'
--- src/platforms/base/backing_store.cc	2013-02-14 16:31:33 +0000
+++ src/ubuntumirclient/backingstore.cpp	2014-07-21 23:47:35 +0000
@@ -1,59 +1,65 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 "backing_store.h"
+#include "backingstore.h"
 #include "logging.h"
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLPaintDevice>
 
-QUbuntuBaseBackingStore::QUbuntuBaseBackingStore(QWindow* window)
+UbuntuBackingStore::UbuntuBackingStore(QWindow* window)
     : QPlatformBackingStore(window)
-    , context_(new QOpenGLContext) {
-  context_->setFormat(window->requestedFormat());
-  context_->setScreen(window->screen());
-  context_->create();
-  DLOG("QUbuntuBaseBackingStore::QUbuntuBaseBackingStore (this=%p, window=%p)", this, window);
-}
-
-QUbuntuBaseBackingStore::~QUbuntuBaseBackingStore() {
-  DLOG("QUbuntuBaseBackingStore::~QUbuntuBaseBackingStore");
-  delete context_;
-}
-
-void QUbuntuBaseBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset) {
-  Q_UNUSED(region);
-  Q_UNUSED(offset);
-  DLOG("QUbuntuBaseBackingStore::flush (this=%p, window=%p)", this, window);
-  context_->swapBuffers(window);
-}
-
-void QUbuntuBaseBackingStore::beginPaint(const QRegion& region) {
-  Q_UNUSED(region);
-  DLOG("QUbuntuBaseBackingStore::beginPaint (this=%p)", this);
-  window()->setSurfaceType(QSurface::OpenGLSurface);
-  context_->makeCurrent(window());
-  device_ = new QOpenGLPaintDevice(window()->size());
-}
-
-void QUbuntuBaseBackingStore::endPaint() {
-  DLOG("QUbuntuBaseBackingStore::endPaint (this=%p)", this);
-  delete device_;
-}
-
-void QUbuntuBaseBackingStore::resize(const QSize& size, const QRegion& staticContents) {
-  Q_UNUSED(size);
-  Q_UNUSED(staticContents);
-  DLOG("QUbuntuBaseBackingStore::resize (this=%p)", this);
+    , mContext(new QOpenGLContext)
+{
+    mContext->setFormat(window->requestedFormat());
+    mContext->setScreen(window->screen());
+    mContext->create();
+}
+
+UbuntuBackingStore::~UbuntuBackingStore()
+{
+    delete mContext;
+}
+
+void UbuntuBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset)
+{
+    Q_UNUSED(region);
+    Q_UNUSED(offset);
+    mContext->swapBuffers(window);
+}
+
+void UbuntuBackingStore::beginPaint(const QRegion& region)
+{
+    Q_UNUSED(region);
+    window()->setSurfaceType(QSurface::OpenGLSurface);
+    mContext->makeCurrent(window());
+    mDevice = new QOpenGLPaintDevice(window()->size());
+}
+
+void UbuntuBackingStore::endPaint()
+{
+    delete mDevice;
+}
+
+void UbuntuBackingStore::resize(const QSize& size, const QRegion& staticContents)
+{
+    Q_UNUSED(size);
+    Q_UNUSED(staticContents);
+}
+
+QPaintDevice* UbuntuBackingStore::paintDevice()
+{
+    return reinterpret_cast<QPaintDevice*>(mDevice);
 }

=== renamed file 'src/platforms/base/backing_store.h' => 'src/ubuntumirclient/backingstore.h'
--- src/platforms/base/backing_store.h	2013-02-14 16:31:33 +0000
+++ src/ubuntumirclient/backingstore.h	2014-07-21 23:47:35 +0000
@@ -1,41 +1,43 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 QUBUNTUBASEBACKINGSTORE_H
-#define QUBUNTUBASEBACKINGSTORE_H
+#ifndef UBUNTU_BACKING_STORE_H
+#define UBUNTU_BACKING_STORE_H
 
 #include <qpa/qplatformbackingstore.h>
 
 class QOpenGLContext;
 class QOpenGLPaintDevice;
 
-class QUbuntuBaseBackingStore : public QPlatformBackingStore {
- public:
-  QUbuntuBaseBackingStore(QWindow* window);
-  ~QUbuntuBaseBackingStore();
-
-  // QPlatformBackingStore methods.
-  void beginPaint(const QRegion&);
-  void endPaint();
-  void flush(QWindow* window, const QRegion& region, const QPoint& offset);
-  void resize(const QSize& size, const QRegion& staticContents);
-  QPaintDevice* paintDevice() { return reinterpret_cast<QPaintDevice*>(device_); }
-
- private:
-  QOpenGLContext* context_;
-  QOpenGLPaintDevice* device_;
+class UbuntuBackingStore : public QPlatformBackingStore
+{
+public:
+    UbuntuBackingStore(QWindow* window);
+    virtual ~UbuntuBackingStore();
+
+    // QPlatformBackingStore methods.
+    void beginPaint(const QRegion&) override;
+    void endPaint() override;
+    void flush(QWindow* window, const QRegion& region, const QPoint& offset) override;
+    void resize(const QSize& size, const QRegion& staticContents) override;
+    QPaintDevice* paintDevice() override;
+
+private:
+    QOpenGLContext* mContext;
+    QOpenGLPaintDevice* mDevice;
 };
 
-#endif  // QUBUNTUBASEBACKINGSTORE_H
+#endif // UBUNTU_BACKING_STORE_H

=== renamed file 'src/platforms/base/clipboard.cc' => 'src/ubuntumirclient/clipboard.cpp'
--- src/platforms/base/clipboard.cc	2013-02-05 02:05:42 +0000
+++ src/ubuntumirclient/clipboard.cpp	2014-07-21 23:47:35 +0000
@@ -1,36 +1,138 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 "clipboard.h"
-#include "logging.h"
-
-QUbuntuBaseClipboard::QUbuntuBaseClipboard() {
-  DLOG("QUbuntuBaseClipboard::QUbuntuBaseClipboard (this=%p)", this);
-}
-
-QUbuntuBaseClipboard::~QUbuntuBaseClipboard() {
-  DLOG("QUbuntuBaseClipboard::~QUbuntuBaseClipboard");
-}
-
-QMimeData* QUbuntuBaseClipboard::mimeData(QClipboard::Mode mode) {
-  DLOG("QUbuntuBaseClipboard::mimeData (this=%p, mode=%d)", this, static_cast<int>(mode));
-  return QPlatformClipboard::mimeData(mode);
-}
-
-void QUbuntuBaseClipboard::setMimeData(QMimeData* data, QClipboard::Mode mode) {
-  DLOG("QUbuntuBaseClipboard::setMimeData (this=%p, data=%p, mode=%d)", this, data,
-       static_cast<int>(mode));
-  QPlatformClipboard::setMimeData(data, mode);
+
+#include <QtCore/QMimeData>
+#include <QtCore/QStringList>
+
+// Platform API
+#include <ubuntu/application/ui/clipboard.h>
+
+// FIXME(loicm) The clipboard data format is not defined by Ubuntu Platform API
+//     which makes it impossible to have non-Qt applications communicate with Qt
+//     applications through the clipboard API. The solution would be to have
+//     Ubuntu Platform define the data format or propose an API that supports
+//     embedding different mime types in the clipboard.
+
+// Data format:
+//   number of mime types      (4 bytes)
+//   data layout               (16 bytes * number of mime types)
+//     mime type string offset (4 bytes)
+//     mime type string size   (4 bytes)
+//     data offset             (4 bytes)
+//     data size               (4 bytes)
+//   data                      (n bytes)
+
+const int maxFormatsCount = 16;
+const int maxBufferSize = 4 * 1024 * 1024;  // 4 Mb
+
+UbuntuClipboard::UbuntuClipboard()
+    : mMimeData(new QMimeData)
+{
+}
+
+UbuntuClipboard::~UbuntuClipboard()
+{
+    delete mMimeData;
+}
+
+QMimeData* UbuntuClipboard::mimeData(QClipboard::Mode mode)
+{
+    Q_UNUSED(mode);
+    // Get clipboard data.
+    void* data = NULL;
+    size_t size = 0;
+    ua_ui_get_clipboard_content(&data, &size);
+
+    // Deserialize, update and return mime data taking care of incorrectly
+    // formatted input.
+    mMimeData->clear();
+    if (static_cast<size_t>(size) > sizeof(int)  // Should be at least that big to read the count.
+            && data != NULL) {
+        const char* const buffer = reinterpret_cast<char*>(data);
+        const int* const header = reinterpret_cast<int*>(data);
+        const int count = qMin(header[0], maxFormatsCount);
+        for (int i = 0; i < count; i++) {
+            const unsigned int formatOffset = header[i*4+1];
+            const unsigned int formatSize = header[i*4+2];
+            const unsigned int dataOffset = header[i*4+3];
+            const unsigned int dataSize = header[i*4+4];
+            if (formatOffset + formatSize <= size && dataOffset + dataSize <= size) {
+                mMimeData->setData(QString(&buffer[formatOffset]),
+                        QByteArray(&buffer[dataOffset], dataSize));
+            }
+        }
+    }
+    return mMimeData;
+}
+
+void UbuntuClipboard::setMimeData(QMimeData* mimeData, QClipboard::Mode mode)
+{
+    Q_UNUSED(mode);
+    if (mimeData == NULL) {
+        ua_ui_set_clipboard_content(NULL, 0);
+        return;
+    }
+
+    const QStringList formats = mimeData->formats();
+    const int count = qMin(formats.size(), maxFormatsCount);
+    const int headerSize = sizeof(int) + count * 4 * sizeof(int);
+    int bufferSize = headerSize;
+    char* buffer;
+
+    // Get the buffer size considering the header size, the NULL-terminated
+    // formats and the non NULL-terminated data.
+    for (int i = 0; i < count; i++)
+        bufferSize += formats[i].size() + 1 + mimeData->data(formats[i]).size();
+    // FIXME(loicm) Implement max buffer size limitation.
+    // FIXME(loicm) Remove ASSERT before release.
+    Q_ASSERT(bufferSize <= maxBufferSize);
+
+    // Serialize data.
+    buffer = new char[bufferSize];
+    int* header = reinterpret_cast<int*>(buffer);
+    int offset = headerSize;
+    header[0] = count;
+    for (int i = 0; i < count; i++) {
+        const int formatOffset = offset;
+        const int formatSize = formats[i].size() + 1;
+        const int dataOffset = offset + formatSize;
+        const int dataSize = mimeData->data(formats[i]).size();
+        memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
+        memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
+        header[i*4+1] = formatOffset;
+        header[i*4+2] = formatSize;
+        header[i*4+3] = dataOffset;
+        header[i*4+4] = dataSize;
+        offset += formatSize + dataSize;
+    }
+
+    // Set clipboard content.
+    ua_ui_set_clipboard_content(reinterpret_cast<void*>(buffer), bufferSize);
+    delete [] buffer;
+}
+
+bool UbuntuClipboard::supportsMode(QClipboard::Mode mode) const
+{
+    return mode == QClipboard::Clipboard;
+}
+
+bool UbuntuClipboard::ownsMode(QClipboard::Mode mode) const
+{
+    Q_UNUSED(mode);
+    return false;
 }

=== modified file 'src/ubuntumirclient/clipboard.h'
--- src/platforms/base/clipboard.h	2013-02-05 02:05:42 +0000
+++ src/ubuntumirclient/clipboard.h	2014-07-21 23:47:35 +0000
@@ -1,33 +1,38 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 QUBUNTUBASECLIPBOARD_H
-#define QUBUNTUBASECLIPBOARD_H
+#ifndef UBUNTU_CLIPBOARD_H
+#define UBUNTU_CLIPBOARD_H
 
 #include <qpa/qplatformclipboard.h>
 
-class QUbuntuBaseClipboard : public QPlatformClipboard {
- public:
-  QUbuntuBaseClipboard();
-  ~QUbuntuBaseClipboard();
-
-  // QPlatformClipboard methods.
-  virtual QMimeData* mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
-  virtual void setMimeData(QMimeData* data, QClipboard::Mode mode = QClipboard::Clipboard);
-  virtual bool supportsMode(QClipboard::Mode mode) const { return mode == QClipboard::Clipboard; }
-  virtual bool ownsMode(QClipboard::Mode mode) const { Q_UNUSED(mode); return false; }
+class UbuntuClipboard : public QPlatformClipboard
+{
+public:
+    UbuntuClipboard();
+    virtual ~UbuntuClipboard();
+
+    // 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:
+    QMimeData* mMimeData;
 };
 
-#endif  // QUBUNTUBASECLIPBOARD_H
+#endif // UBUNTU_CLIPBOARD_H

=== renamed file 'src/platforms/base/context.cc' => 'src/ubuntumirclient/glcontext.cpp'
--- src/platforms/base/context.cc	2014-03-18 16:38:52 +0000
+++ src/ubuntumirclient/glcontext.cpp	2014-07-21 23:47:35 +0000
@@ -1,19 +1,20 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 "context.h"
+#include "glcontext.h"
 #include "window.h"
 #include "logging.h"
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
@@ -40,80 +41,95 @@
 static EGLenum api_in_use()
 {
 #ifdef QTUBUNTU_USE_OPENGL
-  return EGL_OPENGL_API;
-#else
-  return EGL_OPENGL_ES_API;
-#endif
-}
-
-QUbuntuBaseContext::QUbuntuBaseContext(QUbuntuBaseScreen* screen,
-                                       QUbuntuBaseContext* share) {
-  DASSERT(screen != NULL);
-  eglDisplay_ = screen->eglDisplay();
-  screen_ = screen;
-
-  // Create an OpenGL ES 2 context.
-  QVector<EGLint> attribs;
-  attribs.append(EGL_CONTEXT_CLIENT_VERSION);
-  attribs.append(2);
-  attribs.append(EGL_NONE);
-  ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-  ASSERT((eglContext_ = eglCreateContext(
-      eglDisplay_, screen->eglConfig(), share ? share->eglContext() : EGL_NO_CONTEXT,
-      attribs.constData())) != EGL_NO_CONTEXT);
-
-  DLOG("QUbuntuBaseContext::QUbuntuBaseContext (this=%p, screen=%p)", this, screen);
-}
-
-QUbuntuBaseContext::~QUbuntuBaseContext() {
-  DLOG("QUbuntuBaseContext::~QUbuntuBaseContext");
-  ASSERT(eglDestroyContext(eglDisplay_, eglContext_) == EGL_TRUE);
-}
-
-bool QUbuntuBaseContext::makeCurrent(QPlatformSurface* surface) {
-  // DLOG("QUbuntuBaseContext::makeCurrent (this=%p, surface=%p)", this, surface);
-  DASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
-  EGLSurface eglSurface = static_cast<QUbuntuBaseWindow*>(surface)->eglSurface();
-#if defined(QT_NO_DEBUG)
-  eglBindAPI(api_in_use());
-  eglMakeCurrent(eglDisplay_, eglSurface, eglSurface, eglContext_);
-#else
-  ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-  ASSERT(eglMakeCurrent(eglDisplay_, eglSurface, eglSurface, eglContext_) == EGL_TRUE);
-  printOpenGLESConfig();
-#endif
-  return true;
-}
-
-void QUbuntuBaseContext::doneCurrent() {
-  DLOG("QUbuntuBaseContext::doneCurrent (this=%p)", this);
-#if defined(QT_NO_DEBUG)
-  eglBindAPI(api_in_use());
-  eglMakeCurrent(eglDisplay_, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
-  ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-  ASSERT(eglMakeCurrent(eglDisplay_, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_TRUE);
-#endif
-}
-
-void QUbuntuBaseContext::swapBuffers(QPlatformSurface* surface) {
-  // DLOG("QUbuntuBaseContext::swapBuffers (this=%p, surface=%p)", this, surface);
-  EGLSurface eglSurface = static_cast<QUbuntuBaseWindow*>(surface)->eglSurface();
-#if defined(QT_NO_DEBUG)
-  eglBindAPI(api_in_use());
-  eglSwapBuffers(eglDisplay_, eglSurface);
-#else
-  ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-  ASSERT(eglSwapBuffers(eglDisplay_, eglSurface) == EGL_TRUE);
-#endif
-}
-
-void (*QUbuntuBaseContext::getProcAddress(const QByteArray& procName)) () {
-  DLOG("QUbuntuBaseContext::getProcAddress (this=%p, procName=%s)", this, procName.constData());
-#if defined(QT_NO_DEBUG)
-  eglBindAPI(api_in_use());
-#else
-  ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-#endif
-  return eglGetProcAddress(procName.constData());
+    return EGL_OPENGL_API;
+#else
+    return EGL_OPENGL_ES_API;
+#endif
+}
+
+UbuntuOpenGLContext::UbuntuOpenGLContext(UbuntuScreen* screen, UbuntuOpenGLContext* share)
+{
+    ASSERT(screen != NULL);
+    mEglDisplay = screen->eglDisplay();
+    mScreen = screen;
+
+    // Create an OpenGL ES 2 context.
+    QVector<EGLint> attribs;
+    attribs.append(EGL_CONTEXT_CLIENT_VERSION);
+    attribs.append(2);
+    attribs.append(EGL_NONE);
+    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+
+    mEglContext = eglCreateContext(mEglDisplay, screen->eglConfig(), share ? share->eglContext() : EGL_NO_CONTEXT,
+                                   attribs.constData());
+    DASSERT(mEglContext != EGL_NO_CONTEXT);
+}
+
+UbuntuOpenGLContext::~UbuntuOpenGLContext()
+{
+    ASSERT(eglDestroyContext(mEglDisplay, mEglContext) == EGL_TRUE);
+}
+
+bool UbuntuOpenGLContext::makeCurrent(QPlatformSurface* surface)
+{
+    DASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
+    EGLSurface eglSurface = static_cast<UbuntuWindow*>(surface)->eglSurface();
+#if defined(QT_NO_DEBUG)
+    eglBindAPI(api_in_use());
+    eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext);
+#else
+    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+    ASSERT(eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext) == EGL_TRUE);
+    printOpenGLESConfig();
+#endif
+    return true;
+}
+
+void UbuntuOpenGLContext::doneCurrent()
+{
+#if defined(QT_NO_DEBUG)
+    eglBindAPI(api_in_use());
+    eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+#else
+    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+    ASSERT(eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_TRUE);
+#endif
+}
+
+void UbuntuOpenGLContext::swapBuffers(QPlatformSurface* surface)
+{
+    UbuntuWindow *ubuntuWindow = static_cast<UbuntuWindow*>(surface);
+
+    EGLSurface eglSurface = ubuntuWindow->eglSurface();
+#if defined(QT_NO_DEBUG)
+    eglBindAPI(api_in_use());
+    eglSwapBuffers(mEglDisplay, eglSurface);
+#else
+    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+    ASSERT(eglSwapBuffers(mEglDisplay, eglSurface) == EGL_TRUE);
+#endif
+
+    // "Technique" copied from mir, in examples/eglapp.c around line 96
+    EGLint newBufferWidth = -1;
+    EGLint newBufferHeight = -1;
+    /*
+     * Querying the surface (actually the current buffer) dimensions here is
+     * the only truly safe way to be sure that the dimensions we think we
+     * have are those of the buffer being rendered to. But this should be
+     * improved in future; https://bugs.launchpad.net/mir/+bug/1194384
+     */
+    eglQuerySurface(mEglDisplay, eglSurface, EGL_WIDTH, &newBufferWidth);
+    eglQuerySurface(mEglDisplay, eglSurface, EGL_HEIGHT, &newBufferHeight);
+
+    ubuntuWindow->onBuffersSwapped_threadSafe(newBufferWidth, newBufferHeight);
+}
+
+void (*UbuntuOpenGLContext::getProcAddress(const QByteArray& procName)) ()
+{
+#if defined(QT_NO_DEBUG)
+    eglBindAPI(api_in_use());
+#else
+    ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
+#endif
+    return eglGetProcAddress(procName.constData());
 }

=== renamed file 'src/platforms/base/context.h' => 'src/ubuntumirclient/glcontext.h'
--- src/platforms/base/context.h	2014-02-10 15:26:25 +0000
+++ src/ubuntumirclient/glcontext.h	2014-07-21 23:47:35 +0000
@@ -1,43 +1,45 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 QUBUNTUBASECONTEXT_H
-#define QUBUNTUBASECONTEXT_H
+#ifndef UBUNTU_OPENGL_CONTEXT_H
+#define UBUNTU_OPENGL_CONTEXT_H
 
 #include <qpa/qplatformopenglcontext.h>
 #include "screen.h"
 
-class QUbuntuBaseContext : public QPlatformOpenGLContext {
- public:
-  QUbuntuBaseContext(QUbuntuBaseScreen* screen,
-                     QUbuntuBaseContext* share);
-  ~QUbuntuBaseContext();
-
-  // QPlatformOpenGLContext methods.
-  QSurfaceFormat format() const { return screen_->surfaceFormat(); }
-  void swapBuffers(QPlatformSurface* surface);
-  bool makeCurrent(QPlatformSurface* surface);
-  void doneCurrent();
-  bool isValid() const { return eglContext_ != EGL_NO_CONTEXT; }
-  void (*getProcAddress(const QByteArray& procName)) ();
-  EGLContext eglContext() const { return eglContext_; }
-
- private:
-  QUbuntuBaseScreen* screen_;
-  EGLContext eglContext_;
-  EGLDisplay eglDisplay_;
+class UbuntuOpenGLContext : public QPlatformOpenGLContext
+{
+public:
+    UbuntuOpenGLContext(UbuntuScreen* screen, UbuntuOpenGLContext* share);
+    virtual ~UbuntuOpenGLContext();
+
+    // QPlatformOpenGLContext methods.
+    QSurfaceFormat format() const override { return mScreen->surfaceFormat(); }
+    void swapBuffers(QPlatformSurface* surface) override;
+    bool makeCurrent(QPlatformSurface* surface) override;
+    void doneCurrent() override;
+    bool isValid() const override { return mEglContext != EGL_NO_CONTEXT; }
+    void (*getProcAddress(const QByteArray& procName)) ();
+
+    EGLContext eglContext() const { return mEglContext; }
+
+private:
+    UbuntuScreen* mScreen;
+    EGLContext mEglContext;
+    EGLDisplay mEglDisplay;
 };
 
-#endif  //QUBUNTUBASECONTEXT_H
+#endif // UBUNTU_OPENGL_CONTEXT_H

=== renamed file 'src/platforms/base/input.cc' => 'src/ubuntumirclient/input.cpp'
--- src/platforms/base/input.cc	2013-10-17 18:38:03 +0000
+++ src/ubuntumirclient/input.cpp	2014-07-21 23:47:35 +0000
@@ -1,22 +1,27 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 "input.h"
 #include "integration.h"
-#include "native_interface.h"
+#include "nativeinterface.h"
+#include "window.h"
 #include "logging.h"
+
+// Qt
 #if !defined(QT_NO_DEBUG)
 #include <QtCore/QThread>
 #endif
@@ -24,499 +29,377 @@
 #include <QtCore/QCoreApplication>
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatforminputcontext.h>
+#include <qpa/qwindowsysteminterface.h>
+
+#include <xkbcommon/xkbcommon.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
+
+// Platform API
 #include <ubuntu/application/ui/input/event.h>
-#include <input/input_stack_compatibility_layer_flags.h>
 
 #define LOG_EVENTS 0
 
+// XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
+static const uint32_t KeyTable[] = {
+    XKB_KEY_Escape,                  Qt::Key_Escape,
+    XKB_KEY_Tab,                     Qt::Key_Tab,
+    XKB_KEY_ISO_Left_Tab,            Qt::Key_Backtab,
+    XKB_KEY_BackSpace,               Qt::Key_Backspace,
+    XKB_KEY_Return,                  Qt::Key_Return,
+    XKB_KEY_Insert,                  Qt::Key_Insert,
+    XKB_KEY_Delete,                  Qt::Key_Delete,
+    XKB_KEY_Clear,                   Qt::Key_Delete,
+    XKB_KEY_Pause,                   Qt::Key_Pause,
+    XKB_KEY_Print,                   Qt::Key_Print,
+
+    XKB_KEY_Home,                    Qt::Key_Home,
+    XKB_KEY_End,                     Qt::Key_End,
+    XKB_KEY_Left,                    Qt::Key_Left,
+    XKB_KEY_Up,                      Qt::Key_Up,
+    XKB_KEY_Right,                   Qt::Key_Right,
+    XKB_KEY_Down,                    Qt::Key_Down,
+    XKB_KEY_Prior,                   Qt::Key_PageUp,
+    XKB_KEY_Next,                    Qt::Key_PageDown,
+
+    XKB_KEY_Shift_L,                 Qt::Key_Shift,
+    XKB_KEY_Shift_R,                 Qt::Key_Shift,
+    XKB_KEY_Shift_Lock,              Qt::Key_Shift,
+    XKB_KEY_Control_L,               Qt::Key_Control,
+    XKB_KEY_Control_R,               Qt::Key_Control,
+    XKB_KEY_Meta_L,                  Qt::Key_Meta,
+    XKB_KEY_Meta_R,                  Qt::Key_Meta,
+    XKB_KEY_Alt_L,                   Qt::Key_Alt,
+    XKB_KEY_Alt_R,                   Qt::Key_Alt,
+    XKB_KEY_Caps_Lock,               Qt::Key_CapsLock,
+    XKB_KEY_Num_Lock,                Qt::Key_NumLock,
+    XKB_KEY_Scroll_Lock,             Qt::Key_ScrollLock,
+    XKB_KEY_Super_L,                 Qt::Key_Super_L,
+    XKB_KEY_Super_R,                 Qt::Key_Super_R,
+    XKB_KEY_Menu,                    Qt::Key_Menu,
+    XKB_KEY_Hyper_L,                 Qt::Key_Hyper_L,
+    XKB_KEY_Hyper_R,                 Qt::Key_Hyper_R,
+    XKB_KEY_Help,                    Qt::Key_Help,
+
+    XKB_KEY_KP_Space,                Qt::Key_Space,
+    XKB_KEY_KP_Tab,                  Qt::Key_Tab,
+    XKB_KEY_KP_Enter,                Qt::Key_Enter,
+    XKB_KEY_KP_Home,                 Qt::Key_Home,
+    XKB_KEY_KP_Left,                 Qt::Key_Left,
+    XKB_KEY_KP_Up,                   Qt::Key_Up,
+    XKB_KEY_KP_Right,                Qt::Key_Right,
+    XKB_KEY_KP_Down,                 Qt::Key_Down,
+    XKB_KEY_KP_Prior,                Qt::Key_PageUp,
+    XKB_KEY_KP_Next,                 Qt::Key_PageDown,
+    XKB_KEY_KP_End,                  Qt::Key_End,
+    XKB_KEY_KP_Begin,                Qt::Key_Clear,
+    XKB_KEY_KP_Insert,               Qt::Key_Insert,
+    XKB_KEY_KP_Delete,               Qt::Key_Delete,
+    XKB_KEY_KP_Equal,                Qt::Key_Equal,
+    XKB_KEY_KP_Multiply,             Qt::Key_Asterisk,
+    XKB_KEY_KP_Add,                  Qt::Key_Plus,
+    XKB_KEY_KP_Separator,            Qt::Key_Comma,
+    XKB_KEY_KP_Subtract,             Qt::Key_Minus,
+    XKB_KEY_KP_Decimal,              Qt::Key_Period,
+    XKB_KEY_KP_Divide,               Qt::Key_Slash,
+
+    XKB_KEY_ISO_Level3_Shift,        Qt::Key_AltGr,
+    XKB_KEY_Multi_key,               Qt::Key_Multi_key,
+    XKB_KEY_Codeinput,               Qt::Key_Codeinput,
+    XKB_KEY_SingleCandidate,         Qt::Key_SingleCandidate,
+    XKB_KEY_MultipleCandidate,       Qt::Key_MultipleCandidate,
+    XKB_KEY_PreviousCandidate,       Qt::Key_PreviousCandidate,
+
+    XKB_KEY_Mode_switch,             Qt::Key_Mode_switch,
+    XKB_KEY_script_switch,           Qt::Key_Mode_switch,
+    XKB_KEY_XF86AudioRaiseVolume,    Qt::Key_VolumeUp,
+    XKB_KEY_XF86AudioLowerVolume,    Qt::Key_VolumeDown,
+    XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
+    XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
+
+    0,                          0
+};
+
 // Lookup table for the key types.
 // FIXME(loicm) Not sure what to do with that multiple thing.
 static const QEvent::Type kEventType[] = {
-  QEvent::KeyPress,    // ISCL_KEY_EVENT_ACTION_DOWN     = 0
-  QEvent::KeyRelease,  // ISCL_KEY_EVENT_ACTION_UP       = 1
-  QEvent::KeyPress     // ISCL_KEY_EVENT_ACTION_MULTIPLE = 2
-};
-
-// Lookup table for the key codes and unicode values.
-static const struct {
-  const quint32 keycode;
-  const quint16 unicode[3];  // { no modifier, shift modifier, other modifiers }
-} kKeyCode[] = {
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_UNKNOWN         = 0
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SOFT_LEFT       = 1
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SOFT_RIGHT      = 2
-  { Qt::Key_Home, { 0xffff, 0xffff, 0xffff } },            // ISCL_KEYCODE_HOME            = 3
-  { Qt::Key_Back, { 0xffff, 0xffff, 0xffff } },            // ISCL_KEYCODE_BACK            = 4
-  { Qt::Key_Call, { 0xffff, 0xffff, 0xffff } },            // ISCL_KEYCODE_CALL            = 5
-  { Qt::Key_Hangup, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_ENDCALL         = 6
-  { Qt::Key_0, { 0x0030, 0x0029, 0xffff } },               // ISCL_KEYCODE_0               = 7
-  { Qt::Key_1, { 0x0031, 0xffff, 0xffff } },               // ISCL_KEYCODE_1               = 8
-  { Qt::Key_2, { 0x0032, 0xffff, 0xffff } },               // ISCL_KEYCODE_2               = 9
-  { Qt::Key_3, { 0x0033, 0xffff, 0xffff } },               // ISCL_KEYCODE_3               = 10
-  { Qt::Key_4, { 0x0034, 0xffff, 0xffff } },               // ISCL_KEYCODE_4               = 11
-  { Qt::Key_5, { 0x0035, 0xffff, 0xffff } },               // ISCL_KEYCODE_5               = 12
-  { Qt::Key_6, { 0x0036, 0xffff, 0xffff } },               // ISCL_KEYCODE_6               = 13
-  { Qt::Key_7, { 0x0037, 0xffff, 0xffff } },               // ISCL_KEYCODE_7               = 14
-  { Qt::Key_8, { 0x0038, 0xffff, 0xffff } },               // ISCL_KEYCODE_8               = 15
-  { Qt::Key_9, { 0x0039, 0x0028, 0xffff } },               // ISCL_KEYCODE_9               = 16
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_STAR            = 17
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_POUND           = 18
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DPAD_UP         = 19
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DPAD_DOWN       = 20
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DPAD_LEFT       = 21
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DPAD_RIGHT      = 22
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DPAD_CENTER     = 23
-  { Qt::Key_VolumeUp, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_VOLUME_UP       = 24
-  { Qt::Key_VolumeDown, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_VOLUME_DOWN     = 25
-  { Qt::Key_PowerOff, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_POWER           = 26
-  { Qt::Key_Camera, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_CAMERA          = 27
-  { Qt::Key_Clear, { 0xffff, 0xffff, 0xffff } },           // ISCL_KEYCODE_CLEAR           = 28
-  { Qt::Key_A, { 0x0061, 0x0041, 0xffff } },               // ISCL_KEYCODE_A               = 29
-  { Qt::Key_B, { 0x0062, 0x0042, 0xffff } },               // ISCL_KEYCODE_B               = 30
-  { Qt::Key_C, { 0x0063, 0x0043, 0xffff } },               // ISCL_KEYCODE_C               = 31
-  { Qt::Key_D, { 0x0064, 0x0044, 0xffff } },               // ISCL_KEYCODE_D               = 32
-  { Qt::Key_E, { 0x0065, 0x0045, 0xffff } },               // ISCL_KEYCODE_E               = 33
-  { Qt::Key_F, { 0x0066, 0x0046, 0xffff } },               // ISCL_KEYCODE_F               = 34
-  { Qt::Key_G, { 0x0067, 0x0047, 0xffff } },               // ISCL_KEYCODE_G               = 35
-  { Qt::Key_H, { 0x0068, 0x0048, 0xffff } },               // ISCL_KEYCODE_H               = 36
-  { Qt::Key_I, { 0x0069, 0x0049, 0xffff } },               // ISCL_KEYCODE_I               = 37
-  { Qt::Key_J, { 0x006a, 0x004a, 0xffff } },               // ISCL_KEYCODE_J               = 38
-  { Qt::Key_K, { 0x006b, 0x004b, 0xffff } },               // ISCL_KEYCODE_K               = 39
-  { Qt::Key_L, { 0x006c, 0x004c, 0xffff } },               // ISCL_KEYCODE_L               = 40
-  { Qt::Key_M, { 0x006d, 0x004d, 0xffff } },               // ISCL_KEYCODE_M               = 41
-  { Qt::Key_N, { 0x006e, 0x004e, 0xffff } },               // ISCL_KEYCODE_N               = 42
-  { Qt::Key_O, { 0x006f, 0x004f, 0xffff } },               // ISCL_KEYCODE_O               = 43
-  { Qt::Key_P, { 0x0070, 0x0050, 0xffff } },               // ISCL_KEYCODE_P               = 44
-  { Qt::Key_Q, { 0x0071, 0x0051, 0xffff } },               // ISCL_KEYCODE_Q               = 45
-  { Qt::Key_R, { 0x0072, 0x0052, 0xffff } },               // ISCL_KEYCODE_R               = 46
-  { Qt::Key_S, { 0x0073, 0x0053, 0xffff } },               // ISCL_KEYCODE_S               = 47
-  { Qt::Key_T, { 0x0074, 0x0054, 0xffff } },               // ISCL_KEYCODE_T               = 48
-  { Qt::Key_U, { 0x0075, 0x0055, 0xffff } },               // ISCL_KEYCODE_U               = 49
-  { Qt::Key_V, { 0x0076, 0x0056, 0xffff } },               // ISCL_KEYCODE_V               = 50
-  { Qt::Key_W, { 0x0077, 0x0057, 0xffff } },               // ISCL_KEYCODE_W               = 51
-  { Qt::Key_X, { 0x0078, 0x0058, 0xffff } },               // ISCL_KEYCODE_X               = 52
-  { Qt::Key_Y, { 0x0079, 0x0059, 0xffff } },               // ISCL_KEYCODE_Y               = 53
-  { Qt::Key_Z, { 0x007a, 0x005a, 0xffff } },               // ISCL_KEYCODE_Z               = 54
-  { Qt::Key_Comma, { 0x002c, 0xffff, 0xffff } },           // ISCL_KEYCODE_COMMA           = 55
-  { Qt::Key_Period, { 0x002e, 0xffff, 0xffff } },          // ISCL_KEYCODE_PERIOD          = 56
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_ALT_LEFT        = 57
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_ALT_RIGHT       = 58
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SHIFT_LEFT      = 59
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SHIFT_RIGHT     = 60
-  { Qt::Key_Tab, { 0xffff, 0xffff, 0xffff } },             // ISCL_KEYCODE_TAB             = 61
-  { Qt::Key_Space, { 0x0020, 0xffff, 0xffff } },           // ISCL_KEYCODE_SPACE           = 62
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SYM             = 63
-  { Qt::Key_Explorer, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_EXPLORER        = 64
-  { Qt::Key_LaunchMail, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_ENVELOPE        = 65
-  { Qt::Key_Enter, { 0xffff, 0xffff, 0xffff } },           // ISCL_KEYCODE_ENTER           = 66
-  { Qt::Key_Delete, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_DEL             = 67
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_GRAVE           = 68
-  { Qt::Key_Minus, { 0x002d, 0x005f, 0xffff } },           // ISCL_KEYCODE_MINUS           = 69
-  { Qt::Key_Equal, { 0x003d, 0xffff, 0xffff } },           // ISCL_KEYCODE_EQUALS          = 70
-  { Qt::Key_BracketLeft, { 0x005b, 0xffff, 0xffff } },     // ISCL_KEYCODE_LEFT_BRACKET    = 71
-  { Qt::Key_BracketRight, { 0x005d, 0xffff, 0xffff } },    // ISCL_KEYCODE_RIGHT_BRACKET   = 72
-  { Qt::Key_Backslash, { 0x005c, 0xffff, 0xffff } },       // ISCL_KEYCODE_BACKSLASH       = 73
-  { Qt::Key_Semicolon, { 0x003b, 0x003a, 0xffff } },       // ISCL_KEYCODE_SEMICOLON       = 74
-  { Qt::Key_Apostrophe, { 0x0027, 0xffff, 0xffff } },      // ISCL_KEYCODE_APOSTROPHE      = 75
-  { Qt::Key_Slash, { 0x002f, 0xffff, 0xffff } },           // ISCL_KEYCODE_SLASH           = 76
-  { Qt::Key_At, { 0x0040, 0xffff, 0xffff } },              // ISCL_KEYCODE_AT              = 77
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_NUM             = 78
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_HEADSETHOOK     = 79
-  { Qt::Key_CameraFocus, { 0xffff, 0xffff, 0xffff } },     // ISCL_KEYCODE_FOCUS           = 80  // *Camera* focus
-  { Qt::Key_Plus, { 0x002b, 0xffff, 0xffff } },            // ISCL_KEYCODE_PLUS            = 81
-  { Qt::Key_Menu, { 0xffff, 0xffff, 0xffff } },            // ISCL_KEYCODE_MENU            = 82
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_NOTIFICATION    = 83
-  { Qt::Key_Search, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_SEARCH          = 84
-  { Qt::Key_MediaTogglePlayPause, { 0xffff, 0xffff, 0xffff } },  // ISCL_KEYCODE_MEDIA_PLAY_PAUSE= 85
-  { Qt::Key_MediaStop, { 0xffff, 0xffff, 0xffff } },       // ISCL_KEYCODE_MEDIA_STOP      = 86
-  { Qt::Key_MediaNext, { 0xffff, 0xffff, 0xffff } },       // ISCL_KEYCODE_MEDIA_NEXT      = 87
-  { Qt::Key_MediaPrevious, { 0xffff, 0xffff, 0xffff } },   // ISCL_KEYCODE_MEDIA_PREVIOUS  = 88
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MEDIA_REWIND    = 89
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MEDIA_FAST_FORWARD = 90
-  { Qt::Key_VolumeMute, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_MUTE            = 91
-  { Qt::Key_PageUp, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_PAGE_UP         = 92
-  { Qt::Key_PageDown, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_PAGE_DOWN       = 93
-  { Qt::Key_Pictures, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_PICTSYMBOLS     = 94
-  { Qt::Key_Mode_switch, { 0xffff, 0xffff, 0xffff } },     // ISCL_KEYCODE_SWITCH_CHARSET  = 95
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_A        = 96
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_B        = 97
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_C        = 98
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_X        = 99
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_Y        = 100
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_Z        = 101
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_L1       = 102
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_R1       = 103
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_L2       = 104
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_R2       = 105
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_THUMBL   = 106
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_THUMBR   = 107
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_START    = 108
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_SELECT   = 109
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_MODE     = 110
-  { Qt::Key_Escape, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_ESCAPE          = 111
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_FORWARD_DEL     = 112
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CTRL_LEFT       = 113
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CTRL_RIGHT      = 114
-  { Qt::Key_CapsLock, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_CAPS_LOCK       = 115
-  { Qt::Key_ScrollLock, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_SCROLL_LOCK     = 116
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_META_LEFT       = 117
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_META_RIGHT      = 118
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_FUNCTION        = 119
-  { Qt::Key_SysReq, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_SYSRQ           = 120
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BREAK           = 121
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MOVE_HOME       = 122
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MOVE_END        = 123
-  { Qt::Key_Insert, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_INSERT          = 124
-  { Qt::Key_Forward, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_FORWARD         = 125
-  { Qt::Key_MediaPlay, { 0xffff, 0xffff, 0xffff } },       // ISCL_KEYCODE_MEDIA_PLAY      = 126
-  { Qt::Key_MediaPause, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_MEDIA_PAUSE     = 127
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MEDIA_CLOSE     = 128
-  { Qt::Key_Eject, { 0xffff, 0xffff, 0xffff } },           // ISCL_KEYCODE_MEDIA_EJECT     = 129
-  { Qt::Key_MediaRecord, { 0xffff, 0xffff, 0xffff } },     // ISCL_KEYCODE_MEDIA_RECORD    = 130
-  { Qt::Key_F1, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F1              = 131
-  { Qt::Key_F2, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F2              = 132
-  { Qt::Key_F3, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F3              = 133
-  { Qt::Key_F4, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F4              = 134
-  { Qt::Key_F5, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F5              = 135
-  { Qt::Key_F6, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F6              = 136
-  { Qt::Key_F7, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F7              = 137
-  { Qt::Key_F8, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F8              = 138
-  { Qt::Key_F9, { 0xffff, 0xffff, 0xffff } },              // ISCL_KEYCODE_F9              = 139
-  { Qt::Key_F10, { 0xffff, 0xffff, 0xffff } },             // ISCL_KEYCODE_F10             = 140
-  { Qt::Key_F11, { 0xffff, 0xffff, 0xffff } },             // ISCL_KEYCODE_F11             = 141
-  { Qt::Key_F12, { 0xffff, 0xffff, 0xffff } },             // ISCL_KEYCODE_F12             = 142
-  { Qt::Key_NumLock, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_NUM_LOCK        = 143
-  { Qt::Key_0, { 0x0030, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_0        = 144
-  { Qt::Key_1, { 0x0031, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_1        = 145
-  { Qt::Key_2, { 0x0032, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_2        = 146
-  { Qt::Key_3, { 0x0033, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_3        = 147
-  { Qt::Key_4, { 0x0034, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_4        = 148
-  { Qt::Key_5, { 0x0035, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_5        = 149
-  { Qt::Key_6, { 0x0036, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_6        = 150
-  { Qt::Key_7, { 0x0037, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_7        = 151
-  { Qt::Key_8, { 0x0038, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_8        = 152
-  { Qt::Key_9, { 0x0039, 0xffff, 0xffff } },               // ISCL_KEYCODE_NUMPAD_9        = 153
-  { Qt::Key_Slash, { 0x002f, 0xffff, 0xffff } },           // ISCL_KEYCODE_NUMPAD_DIVIDE   = 154
-  { Qt::Key_Asterisk, { 0x002a, 0xffff, 0xffff } },        // ISCL_KEYCODE_NUMPAD_MULTIPLY = 155
-  { Qt::Key_Minus, { 0x002d, 0xffff, 0xffff } },           // ISCL_KEYCODE_NUMPAD_SUBTRACT = 156
-  { Qt::Key_Plus, { 0x002b, 0xffff, 0xffff } },            // ISCL_KEYCODE_NUMPAD_ADD      = 157
-  { Qt::Key_Period, { 0x002e, 0xffff, 0xffff } },          // ISCL_KEYCODE_NUMPAD_DOT      = 158
-  { Qt::Key_Comma, { 0x002c, 0xffff, 0xffff } },           // ISCL_KEYCODE_NUMPAD_COMMA    = 159
-  { Qt::Key_Enter, { 0xffff, 0xffff, 0xffff } },           // ISCL_KEYCODE_NUMPAD_ENTER    = 160
-  { Qt::Key_Equal, { 0x003d, 0xffff, 0xffff } },           // ISCL_KEYCODE_NUMPAD_EQUALS   = 161
-  { Qt::Key_ParenLeft, { 0x0028, 0xffff, 0xffff } },       // ISCL_KEYCODE_NUMPAD_LEFT_PAREN = 162
-  { Qt::Key_ParenRight, { 0x0029, 0xffff, 0xffff } },      // ISCL_KEYCODE_NUMPAD_RIGHT_PAREN = 163
-  { Qt::Key_VolumeMute, { 0xffff, 0xffff, 0xffff } },      // ISCL_KEYCODE_VOLUME_MUTE     = 164
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_INFO            = 165
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CHANNEL_UP      = 166
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CHANNEL_DOWN    = 167
-  { Qt::Key_ZoomIn, { 0xffff, 0xffff, 0xffff } },          // ISCL_KEYCODE_ZOOM_IN         = 168
-  { Qt::Key_ZoomOut, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_ZOOM_OUT        = 169
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_TV              = 170
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_WINDOW          = 171
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_GUIDE           = 172
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_DVR             = 173
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BOOKMARK        = 174
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CAPTIONS        = 175
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_SETTINGS        = 176
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_TV_POWER        = 177
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_TV_INPUT        = 178
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_STB_POWER       = 179
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_STB_INPUT       = 180
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_AVR_POWER       = 181
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_AVR_INPUT       = 182
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_PROG_RED        = 183
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_PROG_GREEN      = 184
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_PROG_YELLOW     = 185
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_PROG_BLUE       = 186
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_APP_SWITCH      = 187
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_1        = 188
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_2        = 189
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_3        = 190
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_4        = 191
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_5        = 192
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_6        = 193
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_7        = 194
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_8        = 195
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_9        = 196
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_10       = 197
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_11       = 198
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_12       = 199
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_13       = 200
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_14       = 201
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_15       = 202
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_BUTTON_16       = 203
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_LANGUAGE_SWITCH = 204
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_MANNER_MODE     = 205
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_3D_MODE         = 206
-  { Qt::Key_unknown, { 0xffff, 0xffff, 0xffff } },         // ISCL_KEYCODE_CONTACTS        = 207
-  { Qt::Key_Calendar, { 0xffff, 0xffff, 0xffff } },        // ISCL_KEYCODE_CALENDAR        = 208
-  { Qt::Key_Music, { 0xffff, 0xffff, 0xffff } },           // ISCL_KEYCODE_MUSIC           = 209
-  { Qt::Key_Calculator, { 0xffff, 0xffff, 0xffff } }       // ISCL_KEYCODE_CALCULATOR      = 210
-};
-
-class QUbuntuBaseEvent : public QEvent {
- public:
-  QUbuntuBaseEvent(QWindow* window, const Event* event, QEvent::Type type)
-      : QEvent(type)
-      , window_(window) {
-    memcpy(&nativeEvent_, event, sizeof(Event));
-  }
-  QWindow* window_;
-  Event nativeEvent_;
-};
-
-QUbuntuBaseInput::QUbuntuBaseInput(QUbuntuBaseIntegration* integration)
-    : integration_(integration)
-    , eventFilterType_(static_cast<QUbuntuBaseNativeInterface*>(
+    QEvent::KeyPress,    // U_KEY_ACTION_DOWN     = 0
+    QEvent::KeyRelease,  // U_KEY_ACTION_UP       = 1
+    QEvent::KeyPress     // U_KEY_ACTION_MULTIPLE = 2
+};
+
+class UbuntuEvent : public QEvent
+{
+public:
+    UbuntuEvent(UbuntuWindow* window, const WindowEvent* event, QEvent::Type type)
+        : QEvent(type), window(window) {
+        memcpy(&nativeEvent, event, sizeof(WindowEvent));
+    }
+    UbuntuWindow* window;
+    WindowEvent nativeEvent;
+};
+
+UbuntuInput::UbuntuInput(UbuntuClientIntegration* integration)
+    : QObject(nullptr)
+    , mIntegration(integration)
+    , mEventFilterType(static_cast<UbuntuNativeInterface*>(
         integration->nativeInterface())->genericEventFilterType())
-    , eventType_(static_cast<QEvent::Type>(QEvent::registerEventType())) {
-
-  // Initialize touch device.
-  touchDevice_ = new QTouchDevice();
-  touchDevice_->setType(QTouchDevice::TouchScreen);
-  touchDevice_->setCapabilities(
-      QTouchDevice::Position | QTouchDevice::Area | QTouchDevice::Pressure |
-      QTouchDevice::NormalizedPosition);
-  QWindowSystemInterface::registerTouchDevice(touchDevice_);
-
-  DLOG("QUbuntuBaseInput::QUbuntuBaseInput (this=%p, integration=%p)", this, integration);
-}
-
-QUbuntuBaseInput::~QUbuntuBaseInput() {
-  DLOG("QUbuntuBaseInput::~QUbuntuBaseInput");
-  // touchDevice_ isn't cleaned up on purpose as it crashes or asserts on "Bus Error".
-}
-
-void QUbuntuBaseInput::customEvent(QEvent* event) {
-  DLOG("QUbuntuBaseInput::customEvent (this=%p, event=%p)", this, event);
-  DASSERT(QThread::currentThread() == thread());
-  QUbuntuBaseEvent* ubuntuEvent = static_cast<QUbuntuBaseEvent*>(event);
-
-  // Event filtering.
-  long result;
-  if (QWindowSystemInterface::handleNativeEvent(
-          ubuntuEvent->window_, eventFilterType_, &ubuntuEvent->nativeEvent_, &result) == true) {
-    DLOG("event filtered out by native interface");
-    return;
-  }
-
-  // Event dispatching.
-  switch (ubuntuEvent->nativeEvent_.type) {
-    case MOTION_EVENT_TYPE: {
-      dispatchMotionEvent(ubuntuEvent->window_, &ubuntuEvent->nativeEvent_);
-      break;
-    }
-    case KEY_EVENT_TYPE: {
-      dispatchKeyEvent(ubuntuEvent->window_, &ubuntuEvent->nativeEvent_);
-      break;
-    }
-    case HW_SWITCH_EVENT_TYPE: {
-      dispatchHWSwitchEvent(ubuntuEvent->window_, &ubuntuEvent->nativeEvent_);
-      break;
-    }
-    default: {
-      DLOG("unhandled event type %d", ubuntuEvent->nativeEvent_.type);
-    }
-  }
-}
-
-void QUbuntuBaseInput::postEvent(QWindow* window, const void* event) {
-  DLOG("QUbuntuBaseInput::postEvent (this=%p, window=%p, event=%p)", this, window, event);
-  QCoreApplication::postEvent(this, new QUbuntuBaseEvent(
-      window, reinterpret_cast<const Event*>(event), eventType_));
-
-  if ((window->flags() && Qt::WindowTransparentForInput) && window->parent()) {
-    DLOG("QUbuntuBaseInput::postEvent (this=%p, window=%p, event=%p)", this, window->parent(), event);
-    QCoreApplication::postEvent(this, new QUbuntuBaseEvent(
-        window->parent(), reinterpret_cast<const Event*>(event), eventType_));
-  }
-}
-
-void QUbuntuBaseInput::dispatchMotionEvent(QWindow* window, const void* ev) {
-  DLOG("QUbuntuBaseInput::dispatchMotionEvent (this=%p, window=%p, event=%p)", this, window, ev);
-  const Event* event = reinterpret_cast<const Event*>(ev);
-
-#if (LOG_EVENTS != 0)
-  // Motion event logging.
-  LOG("MOTION device_id:%d source_id:%d action:%d flags:%d meta_state:%d edge_flags:%d "
-      "button_state:%d x_offset:%.2f y_offset:%.2f x_precision:%.2f y_precision:%.2f "
-      "down_time:%lld event_time:%lld pointer_count:%d {", event->device_id,
-      event->source_id, event->action, event->flags, event->meta_state,
-      event->details.motion.edge_flags, event->details.motion.button_state,
-      event->details.motion.x_offset, event->details.motion.y_offset,
-      event->details.motion.x_precision, event->details.motion.y_precision,
-      event->details.motion.down_time, event->details.motion.event_time,
-      event->details.motion.pointer_count);
-  for (size_t i = 0; i < event->details.motion.pointer_count; i++) {
-    LOG("  id:%d x:%.2f y:%.2f rx:%.2f ry:%.2f maj:%.2f min:%.2f sz:%.2f press:%.2f",
-        event->details.motion.pointer_coordinates[i].id,
-        event->details.motion.pointer_coordinates[i].x,
-        event->details.motion.pointer_coordinates[i].y,
-        event->details.motion.pointer_coordinates[i].raw_x,
-        event->details.motion.pointer_coordinates[i].raw_y,
-        event->details.motion.pointer_coordinates[i].touch_major,
-        event->details.motion.pointer_coordinates[i].touch_minor,
-        event->details.motion.pointer_coordinates[i].size,
-        event->details.motion.pointer_coordinates[i].pressure
-        // event->details.motion.pointer_coordinates[i].orientation  -> Always 0.0.
-        );
-  }
-  LOG("}");
-#endif
-
-  // FIXME(loicm) Max pressure is device specific. That one is for the Samsung Galaxy Nexus. That
-  //     needs to be fixed as soon as the compat input lib adds query support.
-  const float kMaxPressure = 1.28;
-  const QRect kWindowGeometry = window->geometry();
-  QList<QWindowSystemInterface::TouchPoint> touchPoints;
-
-
-  // TODO: Is it worth setting the Qt::TouchPointStationary ones? Currently they are left
-  //       as Qt::TouchPointMoved
-  const int kPointerCount = event->details.motion.pointer_count;
-  for (int i = 0; i < kPointerCount; ++i) {
-    QWindowSystemInterface::TouchPoint touchPoint;
-
-    const float kX = event->details.motion.pointer_coordinates[i].raw_x;
-    const float kY = event->details.motion.pointer_coordinates[i].raw_y;
-    const float kW = event->details.motion.pointer_coordinates[i].touch_major;
-    const float kH = event->details.motion.pointer_coordinates[i].touch_minor;
-    const float kP = event->details.motion.pointer_coordinates[i].pressure;
-    touchPoint.id = event->details.motion.pointer_coordinates[i].id;
-    touchPoint.normalPosition = QPointF(kX / kWindowGeometry.width(), kY / kWindowGeometry.height());
-    touchPoint.area = QRectF(kX - (kW / 2.0), kY - (kH / 2.0), kW, kH);
-    touchPoint.pressure = kP / kMaxPressure;
-    touchPoint.state = Qt::TouchPointMoved;
-
-    touchPoints.append(touchPoint);
-  }
-
-  switch (event->action & ISCL_MOTION_EVENT_ACTION_MASK) {
-    case ISCL_MOTION_EVENT_ACTION_MOVE:
-      // No extra work needed.
-      break;
-
-    case ISCL_MOTION_EVENT_ACTION_DOWN:
-      touchPoints[0].state = Qt::TouchPointPressed;
-      break;
-
-    case ISCL_MOTION_EVENT_ACTION_UP:
-      touchPoints[0].state = Qt::TouchPointReleased;
-      break;
-
-    case ISCL_MOTION_EVENT_ACTION_POINTER_DOWN: {
-      const int index = (event->action & ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_MASK) >>
-          ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
-      touchPoints[index].state = Qt::TouchPointPressed;
-      break;
-    }
-
-    case ISCL_MOTION_EVENT_ACTION_CANCEL:
-    case ISCL_MOTION_EVENT_ACTION_POINTER_UP: {
-      const int index = (event->action & ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_MASK) >>
-          ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
-      touchPoints[index].state = Qt::TouchPointReleased;
-      break;
-    }
-
-    case ISCL_MOTION_EVENT_ACTION_OUTSIDE:
-    case ISCL_MOTION_EVENT_ACTION_HOVER_MOVE:
-    case ISCL_MOTION_EVENT_ACTION_SCROLL:
-    case ISCL_MOTION_EVENT_ACTION_HOVER_ENTER:
-    case ISCL_MOTION_EVENT_ACTION_HOVER_EXIT:
-    default:
-      DLOG("unhandled motion event action %d", event->action & ISCL_MOTION_EVENT_ACTION_MASK);
-  }
-
-  // Touch event propagation.
-  handleTouchEvent(window, event->details.motion.event_time / 1000000, touchDevice_, touchPoints);
-}
-
-void QUbuntuBaseInput::handleTouchEvent(
-    QWindow* window, ulong timestamp, QTouchDevice* device,
-    const QList<struct QWindowSystemInterface::TouchPoint> &points) {
-  DLOG("QUbuntuBaseInput::handleTouchEvent (this=%p, window=%p, timestamp=%lu, device=%p)",
-       this, window, timestamp, device);
-  QWindowSystemInterface::handleTouchEvent(window, timestamp, device, points);
-}
-
-void QUbuntuBaseInput::dispatchKeyEvent(QWindow* window, const void* ev) {
-  DLOG("QUbuntuBaseInput::dispatchKeyEvent (this=%p, window=%p, event=%p)", this, window, ev);
-  const Event* event = reinterpret_cast<const Event*>(ev);
-
-#if (LOG_EVENTS != 0)
-  // Key event logging.
-  LOG("KEY device_id:%d source_id:%d action:%d flags:%d meta_state:%d key_code:%d "
-      "scan_code:%d repeat_count:%d down_time:%lld event_time:%lld is_system_key:%d",
-      event->device_id, event->source_id, event->action, event->flags, event->meta_state,
-      event->details.key.key_code, event->details.key.scan_code,
-      event->details.key.repeat_count, event->details.key.down_time,
-      event->details.key.event_time, event->details.key.is_system_key);
-#endif
-
-  // Key modifier and unicode index mapping.
-  const int kMetaState = event->meta_state;
-  Qt::KeyboardModifiers modifiers = Qt::NoModifier;
-  int unicodeIndex = 0;
-  if (kMetaState & ISCL_META_SHIFT_ON) {
-    modifiers |= Qt::ShiftModifier;
-    unicodeIndex = 1;
-  }
-  if (kMetaState & ISCL_META_CTRL_ON) {
-    modifiers |= Qt::ControlModifier;
-    unicodeIndex = 2;
-  }
-  if (kMetaState & ISCL_META_ALT_ON) {
-    modifiers |= Qt::AltModifier;
-    unicodeIndex = 2;
-  }
-  if (kMetaState & ISCL_META_META_ON) {
-    modifiers |= Qt::MetaModifier;
-    unicodeIndex = 2;
-  }
-
-  // Key event propagation.
-  QEvent::Type keyType = kEventType[event->action];
-  quint32 keyCode = kKeyCode[event->details.key.key_code].keycode;
-  QString text(kKeyCode[event->details.key.key_code].unicode[unicodeIndex]);
-  ulong timestamp = event->details.key.event_time / 1000000;
-  QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
-  if (context) {
-    QKeyEvent qKeyEvent(keyType, keyCode, modifiers, text);
-    qKeyEvent.setTimestamp(timestamp);
-    if (context->filterEvent(&qKeyEvent)) {
-      DLOG("key event filtered out by input context");
-      return;
-    }
-  }
-  handleKeyEvent(window, timestamp, keyType, keyCode, modifiers, text);
-}
-
-void QUbuntuBaseInput::handleKeyEvent(
-    QWindow* window, ulong timestamp, QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
-    const QString& text) {
-  DLOG("QUbuntuBaseInput::handleKeyEvent (this=%p window=%p, timestamp=%lu, type=%d, key=%d, "
-       "modifiers=%d, text='%s')", this, window, timestamp, static_cast<int>(type), key,
-       static_cast<int>(modifiers), text.toUtf8().data());
-  QWindowSystemInterface::handleKeyEvent(window, timestamp, type, key, modifiers, text);
-}
-
-void QUbuntuBaseInput::dispatchHWSwitchEvent(QWindow* window, const void* ev) {
-  Q_UNUSED(window);
-  Q_UNUSED(ev);
-  DLOG("QUbuntuBaseInput::dispatchSwitchEvent (this=%p, window=%p, event=%p)", this, window, ev);
-
-#if (LOG_EVENTS != 0)
-  // HW switch event logging.
-  const Event* event = reinterpret_cast<const Event*>(ev);
-  LOG("HWSWITCH device_id:%d source_id:%d action:%d flags:%d meta_state:%d event_time:%lld "
-      "policy_flags:%u switch_values:%d switch_mask:%d", event->device_id, event->source_id,
-      event->action, event->flags, event->meta_state, event->details.hw_switch.event_time,
-      event->details.hw_switch.policy_flags, event->details.hw_switch.switch_values,
-      event->details.hw_switch.switch_mask);
-#endif
-
-  // FIXME(loicm) Not sure how to interpret that kind of event.
-  DLOG("hw switch events are not handled");
+    , mEventType(static_cast<QEvent::Type>(QEvent::registerEventType()))
+{
+    // Initialize touch device.
+    mTouchDevice = new QTouchDevice;
+    mTouchDevice->setType(QTouchDevice::TouchScreen);
+    mTouchDevice->setCapabilities(
+            QTouchDevice::Position | QTouchDevice::Area | QTouchDevice::Pressure |
+            QTouchDevice::NormalizedPosition);
+    QWindowSystemInterface::registerTouchDevice(mTouchDevice);
+}
+
+UbuntuInput::~UbuntuInput()
+{
+  // Qt will take care of deleting mTouchDevice.
+}
+
+#ifndef QT_NO_DEBUG
+static const char* nativeEventTypeToStr(int eventType)
+{
+    switch (eventType) {
+    case MOTION_WEVENT_TYPE:
+        return "MOTION_WEVENT_TYPE";
+        break;
+    case KEY_WEVENT_TYPE:
+        return "KEY_WEVENT_TYPE";
+        break;
+    case RESIZE_WEVENT_TYPE:
+        return "RESIZE_WEVENT_TYPE";
+        break;
+    case SURFACE_WEVENT_TYPE:
+        return "SURFACE_WEVENT_TYPE";
+    default:
+        return "INVALID!";
+    }
+}
+#endif
+
+void UbuntuInput::customEvent(QEvent* event)
+{
+    DASSERT(QThread::currentThread() == thread());
+    UbuntuEvent* ubuntuEvent = static_cast<UbuntuEvent*>(event);
+    WindowEvent *nativeEvent = &ubuntuEvent->nativeEvent;
+
+    // Event filtering.
+    long result;
+    if (QWindowSystemInterface::handleNativeEvent(
+                ubuntuEvent->window->window(), mEventFilterType, nativeEvent, &result) == true) {
+        DLOG("event filtered out by native interface");
+        return;
+    }
+
+    DLOG("UbuntuInput::customEvent(type=%s)", nativeEventTypeToStr(nativeEvent->type));
+
+    // Event dispatching.
+    switch (nativeEvent->type) {
+    case MOTION_WEVENT_TYPE:
+        dispatchMotionEvent(ubuntuEvent->window->window(), nativeEvent);
+        break;
+    case KEY_WEVENT_TYPE:
+        dispatchKeyEvent(ubuntuEvent->window->window(), nativeEvent);
+        break;
+    case RESIZE_WEVENT_TYPE:
+        ubuntuEvent->window->handleSurfaceResize(nativeEvent->resize.width,
+                                                 nativeEvent->resize.height);
+        break;
+    case SURFACE_WEVENT_TYPE:
+        if (nativeEvent->surface.attribute == SURFACE_ATTRIBUTE_FOCUS) {
+            ubuntuEvent->window->handleSurfaceFocusChange(nativeEvent->surface.value == 1);
+        }
+        break;
+    default:
+        DLOG("unhandled event type %d", nativeEvent->type);
+    }
+}
+
+void UbuntuInput::postEvent(UbuntuWindow* platformWindow, const void* event)
+{
+    QWindow *window = platformWindow->window();
+
+    QCoreApplication::postEvent(this, new UbuntuEvent(
+            platformWindow, reinterpret_cast<const WindowEvent*>(event), mEventType));
+
+    if ((window->flags() && Qt::WindowTransparentForInput) && window->parent()) {
+        QCoreApplication::postEvent(this, new UbuntuEvent(
+                    static_cast<UbuntuWindow*>(platformWindow->QPlatformWindow::parent()),
+                    reinterpret_cast<const WindowEvent*>(event), mEventType));
+    }
+}
+
+void UbuntuInput::dispatchMotionEvent(QWindow* window, const void* ev)
+{
+    const WindowEvent* event = reinterpret_cast<const WindowEvent*>(ev);
+
+    #if (LOG_EVENTS != 0)
+    // Motion event logging.
+    LOG("MOTION device_id:%d source_id:%d action:%d flags:%d meta_state:%d edge_flags:%d "
+            "button_state:%d x_offset:%.2f y_offset:%.2f x_precision:%.2f y_precision:%.2f "
+            "down_time:%lld event_time:%lld pointer_count:%d {", event->motion.device_id,
+            event->motion.source_id, event->motion.action,
+            event->motion.flags, event->motion.meta_state,
+            event->motion.edge_flags, event->motion.button_state,
+            event->motion.x_offset, event->motion.y_offset,
+            event->motion.x_precision, event->motion.y_precision,
+            event->motion.down_time, event->motion.event_time,
+            event->motion.pointer_count);
+    for (size_t i = 0; i < event->motion.pointer_count; i++) {
+        LOG("  id:%d x:%.2f y:%.2f rx:%.2f ry:%.2f maj:%.2f min:%.2f sz:%.2f press:%.2f",
+                event->motion.pointer_coordinates[i].id,
+                event->motion.pointer_coordinates[i].x,
+                event->motion.pointer_coordinates[i].y,
+                event->motion.pointer_coordinates[i].raw_x,
+                event->motion.pointer_coordinates[i].raw_y,
+                event->motion.pointer_coordinates[i].touch_major,
+                event->motion.pointer_coordinates[i].touch_minor,
+                event->motion.pointer_coordinates[i].size,
+                event->motion.pointer_coordinates[i].pressure
+                // event->motion.pointer_coordinates[i].orientation  -> Always 0.0.
+           );
+    }
+    LOG("}");
+    #endif
+
+    // FIXME(loicm) Max pressure is device specific. That one is for the Samsung Galaxy Nexus. That
+    //     needs to be fixed as soon as the compat input lib adds query support.
+    const float kMaxPressure = 1.28;
+    const QRect kWindowGeometry = window->geometry();
+    QList<QWindowSystemInterface::TouchPoint> touchPoints;
+
+
+    // TODO: Is it worth setting the Qt::TouchPointStationary ones? Currently they are left
+    //       as Qt::TouchPointMoved
+    const int kPointerCount = event->motion.pointer_count;
+    for (int i = 0; i < kPointerCount; ++i) {
+        QWindowSystemInterface::TouchPoint touchPoint;
+
+        const float kX = event->motion.pointer_coordinates[i].raw_x;
+        const float kY = event->motion.pointer_coordinates[i].raw_y;
+        const float kW = event->motion.pointer_coordinates[i].touch_major;
+        const float kH = event->motion.pointer_coordinates[i].touch_minor;
+        const float kP = event->motion.pointer_coordinates[i].pressure;
+        touchPoint.id = event->motion.pointer_coordinates[i].id;
+        touchPoint.normalPosition = QPointF(kX / kWindowGeometry.width(), kY / kWindowGeometry.height());
+        touchPoint.area = QRectF(kX - (kW / 2.0), kY - (kH / 2.0), kW, kH);
+        touchPoint.pressure = kP / kMaxPressure;
+        touchPoint.state = Qt::TouchPointMoved;
+
+        touchPoints.append(touchPoint);
+    }
+
+    switch (event->motion.action & U_MOTION_ACTION_MASK) {
+    case U_MOTION_ACTION_MOVE:
+        // No extra work needed.
+        break;
+
+    case U_MOTION_ACTION_DOWN:
+        touchPoints[0].state = Qt::TouchPointPressed;
+        break;
+
+    case U_MOTION_ACTION_UP:
+        touchPoints[0].state = Qt::TouchPointReleased;
+        break;
+
+    case U_MOTION_ACTION_POINTER_DOWN: {
+        const int index = (event->motion.action & U_MOTION_ACTION_POINTER_INDEX_MASK) >>
+            U_MOTION_ACTION_POINTER_INDEX_SHIFT;
+        touchPoints[index].state = Qt::TouchPointPressed;
+        break;
+    }
+
+    case U_MOTION_ACTION_CANCEL:
+    case U_MOTION_ACTION_POINTER_UP: {
+        const int index = (event->motion.action & U_MOTION_ACTION_POINTER_INDEX_MASK) >>
+            U_MOTION_ACTION_POINTER_INDEX_SHIFT;
+        touchPoints[index].state = Qt::TouchPointReleased;
+        break;
+    }
+
+    case U_MOTION_ACTION_OUTSIDE:
+    case U_MOTION_ACTION_HOVER_MOVE:
+    case U_MOTION_ACTION_SCROLL:
+    case U_MOTION_ACTION_HOVER_ENTER:
+    case U_MOTION_ACTION_HOVER_EXIT:
+    default:
+        DLOG("unhandled motion event action %d", event->motion.action & U_MOTION_ACTION_MASK);
+    }
+
+    QWindowSystemInterface::handleTouchEvent(window, event->motion.event_time / 1000000,
+            mTouchDevice, touchPoints);
+}
+
+static uint32_t translateKeysym(uint32_t sym, char *string, size_t size)
+{
+    Q_UNUSED(size);
+    string[0] = '\0';
+
+    if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35)
+        return Qt::Key_F1 + (int(sym) - XKB_KEY_F1);
+
+    for (int i = 0; KeyTable[i]; i += 2) {
+        if (sym == KeyTable[i])
+            return KeyTable[i + 1];
+    }
+
+    string[0] = sym;
+    string[1] = '\0';
+    return toupper(sym);
+}
+
+void UbuntuInput::dispatchKeyEvent(QWindow* window, const void* ev)
+{
+    const WindowEvent* event = reinterpret_cast<const WindowEvent*>(ev);
+
+    #if (LOG_EVENTS != 0)
+    // Key event logging.
+    LOG("KEY device_id:%d source_id:%d action:%d flags:%d meta_state:%d key_code:%d "
+            "scan_code:%d repeat_count:%d down_time:%lld event_time:%lld is_system_key:%d",
+            event->key.device_id, event->key.source_id,
+            event->key.action, event->key.flags, event->key.meta_state,
+            event->key.key_code, event->key.scan_code,
+            event->key.repeat_count, event->key.down_time,
+            event->key.event_time, event->key.is_system_key);
+    #endif
+
+    ulong timestamp = event->key.event_time / 1000000;
+    xkb_keysym_t xk_sym = (xkb_keysym_t)event->key.key_code;
+
+    // Key modifier and unicode index mapping.
+    const int kMetaState = event->key.meta_state;
+    Qt::KeyboardModifiers modifiers = Qt::NoModifier;
+    if (kMetaState & U_KEY_MODIFIER_SHIFT) {
+        modifiers |= Qt::ShiftModifier;
+    }
+    if (kMetaState & U_KEY_MODIFIER_CTRL) {
+        modifiers |= Qt::ControlModifier;
+    }
+    if (kMetaState & U_KEY_MODIFIER_ALT) {
+        modifiers |= Qt::AltModifier;
+    }
+    if (kMetaState & U_KEY_MODIFIER_META) {
+        modifiers |= Qt::MetaModifier;
+    }
+
+    QEvent::Type keyType = event->key.action == U_KEY_ACTION_DOWN ? QEvent::KeyPress : QEvent::KeyRelease;
+
+    char s[2];
+    int sym = translateKeysym(xk_sym, s, sizeof(s));
+    QString text = QString::fromLatin1(s);
+
+    QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
+    if (context) {
+        QKeyEvent qKeyEvent(keyType, sym, modifiers, text);
+        qKeyEvent.setTimestamp(timestamp);
+        if (context->filterEvent(&qKeyEvent)) {
+            DLOG("key event filtered out by input context");
+            return;
+        }
+    }
+
+    QWindowSystemInterface::handleKeyEvent(window, timestamp, keyType, sym, modifiers, text);
 }

=== modified file 'src/ubuntumirclient/input.h'
--- src/platforms/base/input.h	2013-10-17 18:38:03 +0000
+++ src/ubuntumirclient/input.h	2014-07-21 23:47:35 +0000
@@ -1,53 +1,51 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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 QUBUNTUBASEINPUT_H
-#define QUBUNTUBASEINPUT_H
-
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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_INPUT_H
+#define UBUNTU_INPUT_H
+
+// Qt
 #include <qpa/qwindowsysteminterface.h>
 
-class QUbuntuBaseIntegration;
-
-class QUbuntuBaseInput : public QObject {
-  Q_OBJECT
-
- public:
-  QUbuntuBaseInput(QUbuntuBaseIntegration* integration);
-  ~QUbuntuBaseInput();
-
-  // QObject methods.
-  void customEvent(QEvent* event);
-
-  virtual void handleTouchEvent(QWindow* window, ulong timestamp, QTouchDevice* device,
-                                 const QList<struct QWindowSystemInterface::TouchPoint> &points);
-  virtual void handleKeyEvent(QWindow* window, ulong timestamp, QEvent::Type type, int key,
-                              Qt::KeyboardModifiers modifiers, const QString& text);
-
-  void postEvent(QWindow* window, const void* event);
-  QUbuntuBaseIntegration* integration() const { return integration_; }
-
- protected:
-  virtual void dispatchKeyEvent(QWindow* window, const void* event);
-  void dispatchMotionEvent(QWindow* window, const void* event);
-  void dispatchHWSwitchEvent(QWindow* window, const void* event);
-
- private:
-  QUbuntuBaseIntegration* integration_;
-  QTouchDevice* touchDevice_;
-  const QByteArray eventFilterType_;
-  const QEvent::Type eventType_;
+class UbuntuClientIntegration;
+class UbuntuWindow;
+
+class UbuntuInput : public QObject
+{
+    Q_OBJECT
+
+public:
+    UbuntuInput(UbuntuClientIntegration* integration);
+    virtual ~UbuntuInput();
+
+    // QObject methods.
+    void customEvent(QEvent* event) override;
+
+    void postEvent(UbuntuWindow* window, const void* event);
+    UbuntuClientIntegration* integration() const { return mIntegration; }
+
+protected:
+    void dispatchKeyEvent(QWindow* window, const void* event);
+    void dispatchMotionEvent(QWindow* window, const void* event);
+
+private:
+    UbuntuClientIntegration* mIntegration;
+    QTouchDevice* mTouchDevice;
+    const QByteArray mEventFilterType;
+    const QEvent::Type mEventType;
 };
 
-#endif  // QUBUNTUBASEINPUT_H
+#endif // UBUNTU_INPUT_H

=== renamed file 'src/platforms/base/integration.cc' => 'src/ubuntumirclient/integration.cpp'
--- src/platforms/base/integration.cc	2014-02-10 15:26:25 +0000
+++ src/ubuntumirclient/integration.cpp	2014-07-21 23:47:35 +0000
@@ -1,105 +1,208 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
-
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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/>.
+ */
+
+// Qt
+#include <QGuiApplication>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatforminputcontextfactory_p.h>
+#include <qpa/qplatforminputcontext.h>
+#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QOpenGLContext>
+
+// Local
+#include "backingstore.h"
+#include "clipboard.h"
+#include "glcontext.h"
+#include "input.h"
 #include "integration.h"
-#include "native_interface.h"
-#include "backing_store.h"
+#include "logging.h"
+#include "nativeinterface.h"
 #include "screen.h"
-#include "context.h"
-#include "logging.h"
 #include "theme.h"
-#include "platformservices.h"
-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QOpenGLContext>
-
-QUbuntuBaseIntegration::QUbuntuBaseIntegration()
-    : nativeInterface_(new QUbuntuBaseNativeInterface())
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    , eventDispatcher_(createUnixEventDispatcher())
-#endif
-    , fontDb_(new QGenericUnixFontDatabase())
-    , platformServices_(new QUbuntuBasePlatformServices()) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-  QGuiApplicationPrivate::instance()->setEventDispatcher(eventDispatcher_);
-#endif
-  DLOG("QUbuntuBaseIntegration::QUbuntuBaseIntegration (this=%p)", this);
-}
-
-QUbuntuBaseIntegration::~QUbuntuBaseIntegration() {
-  DLOG("QUbuntuBaseIntegration::~QUbuntuBaseIntegration");
-  delete fontDb_;
-  delete nativeInterface_;
-}
-
-bool QUbuntuBaseIntegration::hasCapability(QPlatformIntegration::Capability cap) const {
-  DLOG("QUbuntuBaseIntegration::hasCapability (this=%p)", this);
-  switch (cap) {
-    case ThreadedPixmaps: {
-      return true;
-    } case OpenGL: {
-      return true;
-    }
-    case ThreadedOpenGL: {
-      if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
-        return true;
-      } else {
-        DLOG("disabled threaded OpenGL");
-        return false;
-      }
-    }
-    default: {
-      return QPlatformIntegration::hasCapability(cap);
-    }
-  }
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-QAbstractEventDispatcher *QUbuntuBaseIntegration::createEventDispatcher() const {
+#include "window.h"
+
+// 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)
+{
+    Q_UNUSED(options)
+    Q_UNUSED(context)
+    DASSERT(context != NULL);
+    QCoreApplication::postEvent(QCoreApplication::instance(),
+                                new QEvent(QEvent::ApplicationActivate));
+}
+
+static void aboutToStopCallback(UApplicationArchive *archive, void* context)
+{
+    Q_UNUSED(archive)
+    DASSERT(context != NULL);
+    UbuntuClientIntegration* integration = static_cast<UbuntuClientIntegration*>(context);
+    integration->inputContext()->hideInputPanel();
+    QCoreApplication::postEvent(QCoreApplication::instance(),
+                                new QEvent(QEvent::ApplicationDeactivate));
+}
+
+UbuntuClientIntegration::UbuntuClientIntegration()
+    : QPlatformIntegration()
+    , mNativeInterface(new UbuntuNativeInterface)
+    , mFontDb(new QGenericUnixFontDatabase)
+    , mServices(new UbuntuPlatformServices)
+    , mClipboard(new UbuntuClipboard)
+{
+    setupOptions();
+    setupDescription();
+
+    // Create new application instance
+    mInstance = u_application_instance_new_from_description_with_options(mDesc, mOptions);
+
+    if (mInstance == nullptr)
+        qFatal("UbuntuClientIntegration: connection to Mir server failed. Check that a Mir server is\n"
+               "running, and the correct socket is being used and is accessible. The shell may have\n"
+               "rejected the incoming connection, so check its log file");
+
+    // Create default screen.
+    mScreen = new UbuntuScreen;
+    screenAdded(mScreen);
+
+    // Initialize input.
+    if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_INPUT")) {
+        mInput = new UbuntuInput(this);
+        mInputContext = QPlatformInputContextFactory::create();
+    } else {
+        mInput = nullptr;
+        mInputContext = nullptr;
+    }
+}
+
+UbuntuClientIntegration::~UbuntuClientIntegration()
+{
+    delete mClipboard;
+    delete mInput;
+    delete mInputContext;
+    delete mScreen;
+    delete mServices;
+}
+
+QPlatformServices *UbuntuClientIntegration::services() const
+{
+    return mServices;
+}
+
+void UbuntuClientIntegration::setupOptions()
+{
+    QStringList args = QCoreApplication::arguments();
+    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 UbuntuClientIntegration::setupDescription()
+{
+    mDesc = u_application_description_new();
+    UApplicationId* id = u_application_id_new_from_stringn("QtUbuntu", 8);
+    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);
+}
+
+QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
+{
+    return const_cast<UbuntuClientIntegration*>(this)->createPlatformWindow(window);
+}
+
+QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window)
+{
+    QPlatformWindow* platformWindow = new UbuntuWindow(
+            window, static_cast<UbuntuScreen*>(mScreen), mInput, mInstance);
+    platformWindow->requestActivateWindow();
+    return platformWindow;
+}
+
+bool UbuntuClientIntegration::hasCapability(QPlatformIntegration::Capability cap) const
+{
+    switch (cap) {
+    case ThreadedPixmaps:
+        return true;
+        break;
+
+    case OpenGL:
+        return true;
+        break;
+
+    case ThreadedOpenGL:
+        if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
+            return true;
+        } else {
+            DLOG("ubuntumirclient: disabled threaded OpenGL");
+            return false;
+        }
+        break;
+
+    default:
+        return QPlatformIntegration::hasCapability(cap);
+    }
+}
+
+QAbstractEventDispatcher *UbuntuClientIntegration::createEventDispatcher() const
+{
     return createUnixEventDispatcher();
 }
-#endif
-
-QPlatformBackingStore* QUbuntuBaseIntegration::createPlatformBackingStore(QWindow* window) const {
-  DLOG("QUbuntuBaseIntegration::createPlatformBackingStore (this=%p, window=%p)", this, window);
-  return new QUbuntuBaseBackingStore(window);
-}
-
-QPlatformOpenGLContext* QUbuntuBaseIntegration::createPlatformOpenGLContext(
-    QOpenGLContext* context) const {
-  DLOG("QUbuntuBaseIntegration::createPlatformOpenGLContext const (this=%p, context=%p)", this,
-       context);
-  return const_cast<QUbuntuBaseIntegration*>(this)->createPlatformOpenGLContext(context);
-}
-
-QPlatformOpenGLContext* QUbuntuBaseIntegration::createPlatformOpenGLContext(
-    QOpenGLContext* context) {
-  DLOG("QUbuntuBaseIntegration::createPlatformOpenGLContext (this=%p, context=%p)", this, context);
-  return new QUbuntuBaseContext(
-      static_cast<QUbuntuBaseScreen*>(context->screen()->handle()),
-      static_cast<QUbuntuBaseContext*>(context->shareHandle()));
-}
-
-QStringList QUbuntuBaseIntegration::themeNames() const {
-  DLOG("QUbuntuBaseIntegration::themeNames (this=%p)", this);
-  return QStringList(QUbuntuTheme::name);
-}
-
-QPlatformTheme* QUbuntuBaseIntegration::createPlatformTheme(const QString& name) const {
-  Q_UNUSED(name);
-  DLOG("QUbuntuBaseIntegration::createPlatformTheme (this=%p)", this);
-  return new QUbuntuTheme();
+
+QPlatformBackingStore* UbuntuClientIntegration::createPlatformBackingStore(QWindow* window) const
+{
+    return new UbuntuBackingStore(window);
+}
+
+QPlatformOpenGLContext* UbuntuClientIntegration::createPlatformOpenGLContext(
+        QOpenGLContext* context) const
+{
+    return const_cast<UbuntuClientIntegration*>(this)->createPlatformOpenGLContext(context);
+}
+
+QPlatformOpenGLContext* UbuntuClientIntegration::createPlatformOpenGLContext(
+        QOpenGLContext* context)
+{
+    return new UbuntuOpenGLContext(static_cast<UbuntuScreen*>(context->screen()->handle()),
+                                   static_cast<UbuntuOpenGLContext*>(context->shareHandle()));
+}
+
+QStringList UbuntuClientIntegration::themeNames() const
+{
+    return QStringList(UbuntuTheme::name);
+}
+
+QPlatformTheme* UbuntuClientIntegration::createPlatformTheme(const QString& name) const
+{
+    Q_UNUSED(name);
+    return new UbuntuTheme;
 }

=== modified file 'src/ubuntumirclient/integration.h'
--- src/platforms/base/integration.h	2013-11-06 12:39:51 +0000
+++ src/ubuntumirclient/integration.h	2014-07-21 23:47:35 +0000
@@ -1,53 +1,78 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 QUBUNTUBASEINTEGRATION_H
-#define QUBUNTUBASEINTEGRATION_H
+#ifndef UBUNTU_CLIENT_INTEGRATION_H
+#define UBUNTU_CLIENT_INTEGRATION_H
 
 #include <qpa/qplatformintegration.h>
 
-class QAbstractEventDispatcher;
-
-class QUbuntuBaseIntegration : public QPlatformIntegration {
- public:
-  QUbuntuBaseIntegration();
-  ~QUbuntuBaseIntegration();
-
-  // QPlatformIntegration methods.
-  bool hasCapability(QPlatformIntegration::Capability cap) const;
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-  QAbstractEventDispatcher* guiThreadEventDispatcher() const { return eventDispatcher_; }
-#else
-  QAbstractEventDispatcher *createEventDispatcher() const;
-#endif
-  QPlatformNativeInterface* nativeInterface() const { return nativeInterface_; }
-  QPlatformServices *services() const { return platformServices_; }
-  QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const;
-  QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const;
-  QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context);
-  QPlatformFontDatabase* fontDatabase() const { return fontDb_; }
-  QStringList themeNames() const;
-  QPlatformTheme* createPlatformTheme(const QString& name) const;
-
- private:
-  QPlatformNativeInterface* nativeInterface_;
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-  QAbstractEventDispatcher* eventDispatcher_;
-#endif
-  QPlatformFontDatabase* fontDb_;
-  QPlatformServices* platformServices_;
+#include "platformservices.h"
+
+// platform-api
+#include <ubuntu/application/description.h>
+#include <ubuntu/application/instance.h>
+#include <ubuntu/application/ui/options.h>
+#include <ubuntu/application/ui/session.h>
+
+class UbuntuInput;
+class UbuntuScreen;
+
+class UbuntuClientIntegration : public QPlatformIntegration {
+public:
+    UbuntuClientIntegration();
+    virtual ~UbuntuClientIntegration();
+
+    // QPlatformIntegration methods.
+    bool hasCapability(QPlatformIntegration::Capability cap) const override;
+    QAbstractEventDispatcher *createEventDispatcher() const override;
+    QPlatformNativeInterface* nativeInterface() const override { return mNativeInterface; }
+    QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const override;
+    QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const override;
+    QPlatformFontDatabase* fontDatabase() const override { return mFontDb; }
+    QStringList themeNames() const override;
+    QPlatformTheme* createPlatformTheme(const QString& name) const override;
+    QPlatformServices *services() const override;
+    QPlatformWindow* createPlatformWindow(QWindow* window) const override;
+    QPlatformInputContext* inputContext() const override { return mInputContext; }
+    QPlatformClipboard* clipboard() const override { return mClipboard; }
+
+    QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context);
+    QPlatformWindow* createPlatformWindow(QWindow* window);
+    UbuntuScreen* screen() const { return mScreen; }
+
+private:
+    void setupOptions();
+    void setupDescription();
+
+    QPlatformNativeInterface* mNativeInterface;
+    QPlatformFontDatabase* mFontDb;
+
+    UbuntuPlatformServices* mServices;
+
+    UbuntuScreen* mScreen;
+    UbuntuInput* mInput;
+    QPlatformInputContext* mInputContext;
+    QPlatformClipboard* mClipboard;
+
+    // Platform API stuff
+    UApplicationOptions* mOptions;
+    UApplicationDescription* mDesc;
+    UApplicationInstance* mInstance;
+    UAUiSessionProperties* mProps;
+    UAUiSession* mSession;
 };
 
-#endif  // QUBUNTUBASEINTEGRATION_H
+#endif // UBUNTU_CLIENT_INTEGRATION_H

=== modified file 'src/ubuntumirclient/logging.h'
--- src/platforms/base/logging.h	2013-02-14 16:31:33 +0000
+++ src/ubuntumirclient/logging.h	2014-07-21 23:47:35 +0000
@@ -1,17 +1,18 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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 QUBUNTULOGGING_H
 #define QUBUNTULOGGING_H

=== renamed file 'src/platforms/base/native_interface.cc' => 'src/ubuntumirclient/nativeinterface.cpp'
--- src/platforms/base/native_interface.cc	2014-02-11 13:34:38 +0000
+++ src/ubuntumirclient/nativeinterface.cpp	2014-07-21 23:47:35 +0000
@@ -1,114 +1,113 @@
-// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
-// Copyright © 2013 Canonical Ltd.
-//
-// This program is free software: you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 3, as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied 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/>.
-
-// FIXME(loicm) "nativeorientation" should be implemented in the Ubuntu plugin
-//     and not include headers from it, base isn't meant to know about plugins.
-// FIXME(loicm) Why return a pointer to the screen orientation enum? The enum
-//     can just fit in the returned pointer.
-
-#include "native_interface.h"
-#include "screen.h"
-#include "ubuntu/ubuntucommon/screen.h"
-#include "context.h"
-#include "logging.h"
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied 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/>.
+ */
+
+// Qt
 #include <private/qguiapplication_p.h>
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qscreen.h>
 #include <QtCore/QMap>
 
-class QUbuntuBaseResourceMap : public QMap<QByteArray, QUbuntuBaseNativeInterface::ResourceType> {
- public:
-  QUbuntuBaseResourceMap()
-      : QMap<QByteArray, QUbuntuBaseNativeInterface::ResourceType>() {
-    insert("egldisplay", QUbuntuBaseNativeInterface::EglDisplay);
-    insert("eglcontext", QUbuntuBaseNativeInterface::EglContext);
-    insert("nativeorientation", QUbuntuBaseNativeInterface::NativeOrientation);
-    insert("display", QUbuntuBaseNativeInterface::Display);
-  }
+// Local
+#include "nativeinterface.h"
+#include "screen.h"
+#include "glcontext.h"
+
+class UbuntuResourceMap : public QMap<QByteArray, UbuntuNativeInterface::ResourceType>
+{
+public:
+    UbuntuResourceMap()
+        : QMap<QByteArray, UbuntuNativeInterface::ResourceType>() {
+        insert("egldisplay", UbuntuNativeInterface::EglDisplay);
+        insert("eglcontext", UbuntuNativeInterface::EglContext);
+        insert("nativeorientation", UbuntuNativeInterface::NativeOrientation);
+        insert("display", UbuntuNativeInterface::Display);
+    }
 };
 
-Q_GLOBAL_STATIC(QUbuntuBaseResourceMap, ubuntuResourceMap)
-
-QUbuntuBaseNativeInterface::QUbuntuBaseNativeInterface()
-    : genericEventFilterType_(QByteArrayLiteral("Event"))
-    , nativeOrientation_(NULL) {
-  DLOG("QUbuntuBaseNativeInterface::QUbuntuBaseNativeInterface (this=%p)", this);
-}
-
-QUbuntuBaseNativeInterface::~QUbuntuBaseNativeInterface() {
-  DLOG("QUbuntuBaseNativeInterface::~QUbuntuBaseNativeInterface");
-  if (nativeOrientation_)
-    delete nativeOrientation_;
-}
-
-void* QUbuntuBaseNativeInterface::nativeResourceForContext(
-    const QByteArray& resourceString, QOpenGLContext* context) {
-  DLOG("QUbuntuBaseNativeInterface::nativeResourceForContext (this=%p, resourceString=%s, "
-       "context=%p)", this, resourceString.constData(), context);
-  if (!context)
-    return NULL;
-  const QByteArray kLowerCaseResource = resourceString.toLower();
-  if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-    return NULL;
-  const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-  if (kResourceType == QUbuntuBaseNativeInterface::EglContext)
-    return static_cast<QUbuntuBaseContext*>(context->handle())->eglContext();
-  else
-    return NULL;
-}
-
-void* QUbuntuBaseNativeInterface::nativeResourceForScreen(
-    const QByteArray& resourceString, QScreen* screen) {
-  DLOG("QUbuntuBaseNativeInterface::nativeResourceForScreen (this=%p, resourceString=%s, "
-       "screen=%p)", this, resourceString.constData(), screen);
-  const QByteArray kLowerCaseResource = resourceString.toLower();
-  if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-    return NULL;
-  const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-  if (kResourceType == QUbuntuBaseNativeInterface::Display) {
-    if (!screen)
-      screen = QGuiApplication::primaryScreen();
-    return static_cast<QUbuntuBaseScreen*>(screen->handle())->nativeDisplay();
-  } else
-    return NULL;
-}
-
-void* QUbuntuBaseNativeInterface::nativeResourceForWindow(
-    const QByteArray& resourceString, QWindow* window) {
-  DLOG("QUbuntuBaseNativeInterface::nativeResourceForWindow (this=%p, resourceString=%s, "
-       "window=%p)", this, resourceString.constData(), window);
-  const QByteArray kLowerCaseResource = resourceString.toLower();
-  if (!ubuntuResourceMap()->contains(kLowerCaseResource))
-    return NULL;
-  const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-  if (kResourceType == QUbuntuBaseNativeInterface::EglDisplay) {
-    if (window) {
-      return static_cast<QUbuntuBaseScreen*>(window->screen()->handle())->eglDisplay();
-    } else {
-      return static_cast<QUbuntuBaseScreen*>(
-          QGuiApplication::primaryScreen()->handle())->eglDisplay();
-    }
-  } else if (kResourceType == QUbuntuBaseNativeInterface::NativeOrientation) {
-    // Return the device's native screen orientation.
-    if (window) {
-      nativeOrientation_ = new Qt::ScreenOrientation(static_cast<QUbuntuScreen*>(window->screen()->handle())->nativeOrientation());
-    } else {
-      nativeOrientation_ = new Qt::ScreenOrientation(QGuiApplication::primaryScreen()->handle()->nativeOrientation());
-    }
-    return nativeOrientation_;
-  } else {
-    return NULL;
-  }
+Q_GLOBAL_STATIC(UbuntuResourceMap, ubuntuResourceMap)
+
+UbuntuNativeInterface::UbuntuNativeInterface()
+    : mGenericEventFilterType(QByteArrayLiteral("Event"))
+    , mNativeOrientation(nullptr)
+{
+}
+
+UbuntuNativeInterface::~UbuntuNativeInterface()
+{
+    delete mNativeOrientation;
+    mNativeOrientation = nullptr;
+}
+
+void* UbuntuNativeInterface::nativeResourceForContext(
+    const QByteArray& resourceString, QOpenGLContext* context)
+{
+    if (!context)
+        return nullptr;
+
+    const QByteArray kLowerCaseResource = resourceString.toLower();
+
+    if (!ubuntuResourceMap()->contains(kLowerCaseResource))
+        return nullptr;
+
+    const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
+
+    if (kResourceType == UbuntuNativeInterface::EglContext)