Merge lp:~robertcarr/qtubuntu/mir2 into lp:qtubuntu

[Robert Carr]

Mir server and client support.

Some changes for mir support. Just waking up, back to make more detailed description in 20 min :)

[lp:~robertcarr/qtubuntu/mir2]

148. By Robert Carr on 2013-06-18

Revert deb changes

[Robert Carr (robertcarr)]

Some notes: The key handling changes aren't worrisome for the phablet build as this is unused by the OSK. It's possible this could affect some autopilot tests that use synthetic evdev events. I heard there were some issues there anyway (old code couldn't for example map shift + : -> ;).

Mir emits xkbcommon keysyms (or rather maps in the client library).

Around 1199 Ive commented out this session_properties stuff because I wasn't able to find out what it was supposed to do to make a mirserver implementation.

Around 562 am working around a strange mesa bug on mir/radeon :( Will try and figure it out soon but just confirmed it is still needed.

QEGLConvenience.cpp is needed to build on desktop.

I think the context creation bits may need some work as even on desktop I get GLES when my desktop Qt isn't built for it (and so some QML bits end up not working after creating invalid shaders). Things work well on phone!

[Robert Carr (robertcarr)]

Packaging is assembling at lp:~robertcarr/qtubuntu/mir-with-packaging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/7/console

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

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

149. By Robert Carr on 2013-06-18

Remove stencil hack

[Robert Carr (robertcarr)]

Removed the stencil buffer hack as it only affects desktop radeon and will carry it locally/elsewhere until we get a real fix.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

Jenkins failure is due to requiring platform-api rev. 69 (Add mir support), which adds the ua_ui_display_get_native_type function.

[lp:~robertcarr/qtubuntu/mir2]

150. By Robert Carr on 2013-06-18

Bump papi dependency

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/10/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/11/console

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

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

151. By Robert Carr on 2013-06-19

XKBCommon build dep

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

152. By Robert Carr on 2013-06-19

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/13/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

153. By Robert Carr on 2013-06-19

Add mir session property stubs until papi changes land

154. By Robert Carr on 2013-06-19

Remove stubs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

155. By Robert Carr on 2013-06-19

Update deploy.sh paths

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/17/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

156. By Robert Carr on 2013-06-19

Only link qeglconvenience.cpp on mir

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/18/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

I haven't been involved in the discussions, but it seems like having the mir libs wrapped into ubuntu platform libs isn't really useful, and even more considering the mapping isn't 1:1 and requires code instead of just linking the plugins to the different platform libs. Why not directly writing QPA plugins based on the mir libraries? I guess if we don't have good reasons for that, people in the community will just start doing that. Maybe we should prepare qtubuntu for that. Here's my review anyway.

1/ I think we should have a cleaner directory hierarchy and include "client" in the name of the mir client plugin, something like that:

  platforms
  ├── base (qubuntubase.a)
  ├── ubuntu (qubuntu.so)
  ├── ubuntulegacy (qubuntulegacy.so)
  └── ubuntumir
      ├── common (qubuntumircommon.a)
      ├── client (qubuntumirclient.so)
      └── server (qubuntumirserver.so)

2/ I'd like to keep the key mapping feature for the ubuntu plugin. Now that there is another plugin that's doing it differently I think we should refactor the base input class like that:

  class QUbuntuBaseInput : public QObject {
    ...
   public:
    ...
    virtual void dispatchMotionEvent(QWindow* window, const void* event);
    virtual void dispatchKeyEvent(QWindow* window, const void* event);
    virtual void dispatchHWSwitchEvent(QWindow* window, const void* event);
    ...
  };

By removing the handle*Event virtual functions, directly having the dispatch*Event functions as virtual and move the implementations of these functions (that are different for ubuntu and ubuntumir) directly in the plugins. That said it would be bad to reimplement dispatchMotionEvent() that's almost exactly the same for ubuntu and ubuntumir apart from the enums, can't we have the U_* enums in the classic platform-api? That would allow to have dispatchMotionEvent() in base and share it.

3/ I'm quite skeptical with copying the EglConvenience code, for obvious design reasons but also for legal reasons. I haven't taken the time to reflect on it though but if there's a good reason (actually if there's a bad reason too) it should be described in the code.

Now for the cosmetics:

4/ Is that ugly because of the platform API (in which case there shouldn't really be a comment) or because it could be improved (in which case there should be a description of how it could be improved)? Also qtubuntu uses FIXME(nickname) instead of TODO so that we can directly ask the person who knows more about it.

  + // TODO: A little ugly
  + UAUiDisplay* u_display = ua_ui_display_new_with_index(0);
  + ASSERT((eglDisplay_ = eglGetDisplay(ua_ui_display_get_native_type(u_display))) != EGL_NO_DISPLAY);
  + ua_ui_display_destroy(u_display);

5/ qtubuntu project uses the Google coding guidelines, can you please respect it and at least use 2 spaces for indentation (see translateKey() for instance).

6/ As a policy in the qtubuntu project, file-scoped symbols (that don't need to be visible cross object boundary) use the static keyword, so to keep it consistent can you please replace the use of unnamed namespace for the translateKey() function? (That function currently uses both static and unnamed namesp...

review: Needs Fixing

[lp:~robertcarr/qtubuntu/mir2]

157. By Robert Carr on 2013-06-21

Rename ubuntu plugin to mirclient

158. By Robert Carr on 2013-06-21

Revert input changes

159. By Robert Carr on 2013-06-21

More source reorganizing

160. By Robert Carr on 2013-06-21

dispatchKeyEvent can be virtual

161. By Robert Carr on 2013-06-21

Begin input refactoring

162. By Robert Carr on 2013-06-21

More work on refactoring

163. By Robert Carr on 2013-06-21

Directory reorg

164. By Robert Carr on 2013-06-24

Add some mir input support

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/19/console

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

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/qtubuntu/mir2]

165. By Robert Carr on 2013-06-24

Remove qegl

166. By Robert Carr on 2013-06-24

input.h: Clean up access

167. By Robert Carr on 2013-06-24

Cleanup'

168. By Robert Carr on 2013-06-24

More cleanup

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/20/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/33/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/21/console

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

>> I haven't been involved in the discussions, but it seems like having the mir libs wrapped into ubuntu platform libs >> isn't really useful, and even more considering the mapping isn't 1:1 and requires code instead of just linking the
>> plugins to the different platform libs.
>>

Actually for mirclient and server (The only two backends which will remain) the code is the same. There is some other reasoning, ping me on IRC and we will talk about it.

>>
1/ I think we should have a cleaner directory hierarchy and include "client" in the name of the mir client plugin, something like that:
>>

Addressed

>>
2/ I'd like to keep the key mapping feature for the ubuntu plugin. Now that there is another plugin that's doing it differently I think we should refactor the base input class like that:
>>

Addressed

>>
3/ I'm quite skeptical with copying the EglConvenience code, for obvious design reasons but also for legal reasons. I haven't taken the time to reflect on it though but if there's a good reason (actually if there's a bad reason too) it should be described in the code.
>>

No longer required by desktop qt in saucy so I deleted it.

>> Now for the cosmetics:
>> 4
SNIP
>> 7

Addressed!

Requires: https://code.launchpad.net/~robertcarr/platform-api/missing-mir-stub/+merge/170449

[Ricardo Mendoza (ricmm)]

https://code.launchpad.net/~robertcarr/platform-api/missing-mir-stub/+merge/170449 is long merged

[Robert Carr (robertcarr)]

Ping?

[lp:~robertcarr/qtubuntu/mir2]

169. By Robert Carr on 2013-07-02

Remove generated file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

Remains 2 generated moc files (main.moc).

review: Needs Fixing

[lp:~robertcarr/qtubuntu/mir2]

170. By Robert Carr on 2013-07-23

Merge trunk

171. By Robert Carr on 2013-07-23

Remove moc files

[Robert Carr (robertcarr)]

Merged trunk! Removed moc. I seem to not get emails/lose emails from this branch :(

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-07-16 21:36:24 +0000
+++ debian/control	2013-07-23 19:01:25 +0000
@@ -10,9 +10,10 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                libhybris-dev,
-               libplatform-api1-dev (>= 0.18.1daily13.06.11),
+               libubuntu-platform-api1-dev (>= 0.18.1daily13.06.18-0ubuntu1),
                libudev-dev,
                libxrender-dev,
+               libxkbcommon-dev,
                qt5-default,
                qtbase5-private-dev,
                qtdeclarative5-private-dev,

=== modified file 'deploy.sh'
--- deploy.sh	2013-02-12 11:09:38 +0000
+++ deploy.sh	2013-07-23 19:01:25 +0000
@@ -1,6 +1,8 @@
 #!/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 src/modules/application/libubuntuapplicationplugin.so /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/imports/Ubuntu/Application
 adb push src/modules/application/qmldir /data/ubuntu/usr/lib/arm-linux-gnueabihf/qt5/imports/Ubuntu/Application

=== modified file 'src/platforms/base/input.h'
--- src/platforms/base/input.h	2013-02-26 01:03:00 +0000
+++ src/platforms/base/input.h	2013-07-23 19:01:25 +0000
@@ -38,11 +38,12 @@
   void postEvent(QWindow* window, const void* event);
   QUbuntuBaseIntegration* integration() const { return integration_; }
 
- private:
+ protected:
+  virtual void dispatchKeyEvent(QWindow* window, const void* event);
   void dispatchMotionEvent(QWindow* window, const void* event);
-  void dispatchKeyEvent(QWindow* window, const void* event);
   void dispatchHWSwitchEvent(QWindow* window, const void* event);
 
+ private:
   QUbuntuBaseIntegration* integration_;
   QTouchDevice* touchDevice_;
   QList<QWindowSystemInterface::TouchPoint> touchPoints_;

=== modified file 'src/platforms/base/native_interface.cc'
--- src/platforms/base/native_interface.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/base/native_interface.cc	2013-07-23 19:01:25 +0000
@@ -20,7 +20,7 @@
 
 #include "native_interface.h"
 #include "screen.h"
-#include "ubuntu/screen.h"
+#include "ubuntu/ubuntucommon/screen.h"
 #include "context.h"
 #include "logging.h"
 #include <private/qguiapplication_p.h>

=== modified file 'src/platforms/base/screen.cc'
--- src/platforms/base/screen.cc	2013-02-26 01:14:35 +0000
+++ src/platforms/base/screen.cc	2013-07-23 19:01:25 +0000
@@ -17,6 +17,8 @@
 #include "logging.h"
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
+#include <ubuntu/application/ui/display.h>
+
 static const int kSwapInterval = 1;
 
 #if !defined(QT_NO_DEBUG)
@@ -76,7 +78,10 @@
     , eglConfig_(NULL) {
   // Initialize EGL.
   ASSERT(eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE);
-  ASSERT((eglDisplay_ = eglGetDisplay(EGL_DEFAULT_DISPLAY)) != EGL_NO_DISPLAY);
+
+  UAUiDisplay* u_display = ua_ui_display_new_with_index(0);
+  ASSERT((eglDisplay_ = eglGetDisplay(ua_ui_display_get_native_type(u_display))) != EGL_NO_DISPLAY);
+  ua_ui_display_destroy(u_display);
   ASSERT(eglInitialize(eglDisplay_, NULL, NULL) == EGL_TRUE);
 
   // Configure EGL buffers format.

=== modified file 'src/platforms/base/window.cc'
--- src/platforms/base/window.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/base/window.cc	2013-07-23 19:01:25 +0000
@@ -33,7 +33,7 @@
 }
 
 void QUbuntuBaseWindow::createSurface(EGLNativeWindowType nativeWindow) {
-  DLOG("QUbuntuBaseWindow::createSurface (this=%p, nativeWindow=%u)", this, nativeWindow);
+  DLOG("QUbuntuBaseWindow::createSurface (this=%p, nativeWindow=%p)", this, reinterpret_cast<void*>(nativeWindow));
   ASSERT((eglSurface_ = eglCreateWindowSurface(
       screen_->eglDisplay(), screen_->eglConfig(), nativeWindow, NULL)) != EGL_NO_SURFACE);
 }

=== modified file 'src/platforms/platforms.pro'
--- src/platforms/platforms.pro	2013-01-17 19:51:06 +0000
+++ src/platforms/platforms.pro	2013-07-23 19:01:25 +0000
@@ -1,6 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += base ubuntulegacy ubuntu
+SUBDIRS += base ubuntu
 
-ubuntulegacy.depends = base
 ubuntu.depends = base

=== added directory 'src/platforms/ubuntu'
=== removed file 'src/platforms/ubuntu/main.cc'
--- src/platforms/ubuntu/main.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/ubuntu/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 QUbuntuIntegrationPlugin : public QPlatformIntegrationPlugin {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1"
-                    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();
-  return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"

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

=== added file 'src/platforms/ubuntu/ubuntu.pro'
--- src/platforms/ubuntu/ubuntu.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntu.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,14 @@
+TEMPLATE = subdirs
+
+!mirclient:!mirserver {
+CONFIG += hybris
+}
+
+hybris {
+SUBDIRS += ubuntu
+}
+
+SUBDIRS += ubuntucommon ubuntumir
+
+ubuntu.depends = ubuntucommon
+ubuntumir.depends = ubuntucommon

=== added file 'src/platforms/ubuntu/ubuntu/main.cc'
--- src/platforms/ubuntu/ubuntu/main.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntu/main.cc	2013-07-23 19:01:25 +0000
@@ -0,0 +1,67 @@
+// 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 "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1"
+                    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"

=== added file 'src/platforms/ubuntu/ubuntu/ubuntu.json'
--- src/platforms/ubuntu/ubuntu/ubuntu.json	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntu/ubuntu.json	2013-07-23 19:01:25 +0000
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "ubuntu" ]
+}

=== added file 'src/platforms/ubuntu/ubuntu/ubuntu.pro'
--- src/platforms/ubuntu/ubuntu/ubuntu.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntu/ubuntu.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,24 @@
+TARGET = qubuntu
+TEMPLATE = lib
+
+QT += core-private gui-private platformsupport-private sensors-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
+
+CONFIG += plugin link_prl
+
+INCLUDEPATH += ../../ ../
+LIBS += -L../ubuntucommon -lqubuntucommon -lubuntu_application_api -L../../base -lubuntubase
+
+OTHER_FILES += ubuntu.json
+
+target.path += $$[QT_INSTALL_PLUGINS]/platforms
+INSTALLS += target

=== renamed directory 'src/platforms/ubuntu' => 'src/platforms/ubuntu/ubuntucommon'
=== added file 'src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h'
--- src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntucommon/input_adaptor_factory.h	2013-07-23 19:01:25 +0000
@@ -0,0 +1,32 @@
+// 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

=== modified file 'src/platforms/ubuntu/ubuntucommon/integration.cc'
--- src/platforms/ubuntu/integration.cc	2013-06-05 20:54:18 +0000
+++ src/platforms/ubuntu/ubuntucommon/integration.cc	2013-07-23 19:01:25 +0000
@@ -17,6 +17,7 @@
 #include "window.h"
 #include "input.h"
 #include "clipboard.h"
+#include "input_adaptor_factory.h"
 #include "base/logging.h"
 #include <QtCore/QCoreApplication>
 #include <qpa/qplatformnativeinterface.h>
@@ -42,7 +43,7 @@
   integration->inputContext()->hideInputPanel();
 }
 
-QUbuntuIntegration::QUbuntuIntegration()
+QUbuntuIntegration::QUbuntuIntegration(QUbuntuInputAdaptorFactory *input_factory)
     : clipboard_(new QUbuntuClipboard()) {
   // Init Ubuntu Platform library.
   QStringList args = QCoreApplication::arguments();
@@ -73,7 +74,7 @@
 
   // Initialize input.
   if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_INPUT")) {
-    input_ = new QUbuntuInput(this);
+    input_ = input_factory->create_input_adaptor(this);
     inputContext_ = QPlatformInputContextFactory::create();
   } else {
     input_ = NULL;
@@ -134,10 +135,8 @@
     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())
-        );
+    ua_ui_session_properties_set_remote_pid(props_,
+      static_cast<uint32_t>(QCoreApplication::applicationPid()));
 
     session_ = ua_ui_session_new_with_properties(props_);
 

=== modified file 'src/platforms/ubuntu/ubuntucommon/integration.h'
--- src/platforms/ubuntu/integration.h	2013-05-21 22:11:57 +0000
+++ src/platforms/ubuntu/ubuntucommon/integration.h	2013-07-23 19:01:25 +0000
@@ -21,11 +21,12 @@
 #include <ubuntu/application/instance.h>
 #include <ubuntu/application/ui/session.h>
 
+class QUbuntuInputAdaptorFactory;
 class QUbuntuInput;
 
 class QUbuntuIntegration : public QUbuntuBaseIntegration {
  public:
-  QUbuntuIntegration();
+  QUbuntuIntegration(QUbuntuInputAdaptorFactory* input_factory);
   ~QUbuntuIntegration();
 
   // QPlatformIntegration methods.

=== renamed file 'src/platforms/ubuntu/ubuntu.pro' => 'src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro'
--- src/platforms/ubuntu/ubuntu.pro	2013-02-26 19:25:07 +0000
+++ src/platforms/ubuntu/ubuntucommon/ubuntucommon.pro	2013-07-23 19:01:25 +0000
@@ -1,4 +1,4 @@
-TARGET = qubuntu
+TARGET = qubuntucommon
 TEMPLATE = lib
 
 QT += core-private gui-private platformsupport-private sensors-private
@@ -11,8 +11,7 @@
   QMAKE_CXXFLAGS_DEBUG += -Werror
 }
 
-SOURCES = main.cc \
-          integration.cc \
+SOURCES = integration.cc \
           window.cc \
           screen.cc \
           input.cc \
@@ -22,16 +21,10 @@
           window.h \
           screen.h \
           input.h \
-          clipboard.h
-
-CONFIG += plugin link_prl
-
-PRE_TARGETDEPS = ../base/libubuntubase.a
-
-INCLUDEPATH += ..
-LIBS += -L../base -lubuntubase -lubuntu_application_api
-
-OTHER_FILES += ubuntu.json
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
+          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

=== added directory 'src/platforms/ubuntu/ubuntumir'
=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumir.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumir.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumir.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+
+mirclient|mirserver{
+SUBDIRS += ubuntumircommon
+}
+
+mirclient {
+SUBDIRS += ubuntumirclient
+}
+mirserver {
+SUBDIRS += ubuntumirserver
+}
+
+ubuntumirclient.depends = ubuntumircommon
+ubuntumirserver.depends = ubuntumircommon
+

=== added directory 'src/platforms/ubuntu/ubuntumir/ubuntumirclient'
=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc	2013-07-23 19:01:25 +0000
@@ -0,0 +1,47 @@
+// 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 QUbuntuMirClientIntegrationPlugin : public QPlatformIntegrationPlugin {
+  Q_OBJECT
+  Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1"
+                    FILE "ubuntumirclient.json")
+
+ public:
+  QStringList keys() const;
+  QPlatformIntegration* create(const QString&, const QStringList&);
+};
+
+QStringList QUbuntuMirClientIntegrationPlugin::keys() const {
+  QStringList list;
+  list << "ubuntumirclient";
+  return list;
+}
+
+QPlatformIntegration* QUbuntuMirClientIntegrationPlugin::create(
+    const QString& system, const QStringList& paramList) {
+  Q_UNUSED(paramList);
+  if (system.toLower() == "ubuntumirclient")
+    return new QUbuntuMirIntegration();
+  return 0;
+}
+
+QT_END_NAMESPACE
+
+#include "main.moc"

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.json'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.json	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.json	2013-07-23 19:01:25 +0000
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "ubuntumirclient" ]
+}

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,24 @@
+TARGET = qubuntumirclient
+TEMPLATE = lib
+
+QT += core-private gui-private platformsupport-private sensors-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 
+
+CONFIG += plugin link_prl
+
+INCLUDEPATH += ../../../ ../../ ../
+LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirclient
+
+OTHER_FILES += ubuntumirclient.json
+
+target.path += $$[QT_INSTALL_PLUGINS]/platforms
+INSTALLS += target

=== added directory 'src/platforms/ubuntu/ubuntumir/ubuntumircommon'
=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.cc	2013-07-23 19:01:25 +0000
@@ -0,0 +1,180 @@
+// 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,
+
+  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);
+}

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/input.h	2013-07-23 19:01:25 +0000
@@ -0,0 +1,31 @@
+// 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

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.cc	2013-07-23 19:01:25 +0000
@@ -0,0 +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/>.
+
+#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() {
+}

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/integration.h	2013-07-23 19:01:25 +0000
@@ -0,0 +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/>.
+
+#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

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumircommon/ubuntumircommon.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,21 @@
+TARGET = qubuntumircommon
+TEMPLATE = lib
+
+QT += core-private gui-private platformsupport-private sensors-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

=== added directory 'src/platforms/ubuntu/ubuntumir/ubuntumirserver'
=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	2013-07-23 19:01:25 +0000
@@ -0,0 +1,47 @@
+// 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 "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1"
+                    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")
+    return new QUbuntuMirIntegration();
+  return 0;
+}
+
+QT_END_NAMESPACE
+
+#include "main.moc"

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.json	2013-07-23 19:01:25 +0000
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "ubuntumirserver" ]
+}

=== added file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	1970-01-01 00:00:00 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	2013-07-23 19:01:25 +0000
@@ -0,0 +1,24 @@
+TARGET = qubuntumirserver
+TEMPLATE = lib
+
+QT += core-private gui-private platformsupport-private sensors-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 
+
+CONFIG += plugin link_prl
+
+INCLUDEPATH += ../../../ ../../ ../
+LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirserver
+
+OTHER_FILES += ubuntu.json
+
+target.path += $$[QT_INSTALL_PLUGINS]/platforms
+INSTALLS += target