Merge lp:~dandrader/qtubuntu/provideMirConnection into lp:qtubuntu

[Daniel d'Andrada]

Add QPlatformNativeInterface::nativeResourceForIntegration("mirConnection")

Allow Qt applications to access the underlying MirConnection.

So that the settings application can use mir client API to set the display mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/34/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-06-23 22:19:27 +0000
+++ src/ubuntumirclient/integration.cpp	2015-08-27 09:45:02 +0000
@@ -79,6 +79,8 @@
                "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");
 
+    mNativeInterface->setMirConnection(u_application_instance_get_mir_connection(mInstance));
+
     // Create default screen.
     mScreen = new UbuntuScreen(u_application_instance_get_mir_connection(mInstance));
     screenAdded(mScreen);
@@ -241,3 +243,8 @@
 {
     return mClipboard.data();
 }
+
+QPlatformNativeInterface* UbuntuClientIntegration::nativeInterface() const
+{
+    return mNativeInterface;
+}

=== modified file 'src/ubuntumirclient/integration.h'
--- src/ubuntumirclient/integration.h	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/integration.h	2015-08-27 09:45:02 +0000
@@ -28,6 +28,7 @@
 
 class UbuntuClipboard;
 class UbuntuInput;
+class UbuntuNativeInterface;
 class UbuntuScreen;
 
 class UbuntuClientIntegration : public QPlatformIntegration {
@@ -38,7 +39,7 @@
     // QPlatformIntegration methods.
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
     QAbstractEventDispatcher *createEventDispatcher() const override;
-    QPlatformNativeInterface* nativeInterface() const override { return mNativeInterface; }
+    QPlatformNativeInterface* nativeInterface() const override;
     QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const override;
     QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const override;
     QPlatformFontDatabase* fontDatabase() const override { return mFontDb; }
@@ -58,7 +59,7 @@
     void setupOptions();
     void setupDescription();
 
-    QPlatformNativeInterface* mNativeInterface;
+    UbuntuNativeInterface* mNativeInterface;
     QPlatformFontDatabase* mFontDb;
 
     UbuntuPlatformServices* mServices;

=== modified file 'src/ubuntumirclient/nativeinterface.cpp'
--- src/ubuntumirclient/nativeinterface.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/nativeinterface.cpp	2015-08-27 09:45:02 +0000
@@ -34,6 +34,7 @@
         insert("eglcontext", UbuntuNativeInterface::EglContext);
         insert("nativeorientation", UbuntuNativeInterface::NativeOrientation);
         insert("display", UbuntuNativeInterface::Display);
+        insert("mirConnection", UbuntuNativeInterface::MirConnection);
     }
 };
 
@@ -42,6 +43,7 @@
 UbuntuNativeInterface::UbuntuNativeInterface()
     : mGenericEventFilterType(QByteArrayLiteral("Event"))
     , mNativeOrientation(nullptr)
+    , mMirConnection(nullptr)
 {
 }
 
@@ -51,6 +53,23 @@
     mNativeOrientation = nullptr;
 }
 
+void* UbuntuNativeInterface::nativeResourceForIntegration(const QByteArray &resourceString)
+{
+    const QByteArray lowerCaseResource = resourceString.toLower();
+
+    if (!ubuntuResourceMap()->contains(lowerCaseResource)) {
+        return nullptr;
+    }
+
+    const ResourceType resourceType = ubuntuResourceMap()->value(lowerCaseResource);
+
+    if (resourceType == UbuntuNativeInterface::MirConnection) {
+        return mMirConnection;
+    } else {
+        return nullptr;
+    }
+}
+
 void* UbuntuNativeInterface::nativeResourceForContext(
     const QByteArray& resourceString, QOpenGLContext* context)
 {

=== modified file 'src/ubuntumirclient/nativeinterface.h'
--- src/ubuntumirclient/nativeinterface.h	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/nativeinterface.h	2015-08-27 09:45:02 +0000
@@ -21,12 +21,13 @@
 
 class UbuntuNativeInterface : public QPlatformNativeInterface {
 public:
-    enum ResourceType { EglDisplay, EglContext, NativeOrientation, Display };
+    enum ResourceType { EglDisplay, EglContext, NativeOrientation, Display, MirConnection };
 
     UbuntuNativeInterface();
     ~UbuntuNativeInterface();
 
     // QPlatformNativeInterface methods.
+    void* nativeResourceForIntegration(const QByteArray &resource) override;
     void* nativeResourceForContext(const QByteArray& resourceString,
                                    QOpenGLContext* context) override;
     void* nativeResourceForWindow(const QByteArray& resourceString,
@@ -36,10 +37,12 @@
 
     // New methods.
     const QByteArray& genericEventFilterType() const { return mGenericEventFilterType; }
+    void setMirConnection(void *mirConnection) { mMirConnection = mirConnection; }
 
 private:
     const QByteArray mGenericEventFilterType;
     Qt::ScreenOrientation* mNativeOrientation;
+    void *mMirConnection;
 };
 
 #endif // UBUNTU_NATIVE_INTERFACE_H