Merge lp:~aacid/qtubuntu/fix_unregistered_metatype_warning into lp:qtubuntu

[Albert Astals Cid]

Register metatype used in queued invokeMethod

Otherwise I get
   QMetaMethod::invoke: Unable to handle unregistered datatype 'QPlatformWindow*'
when launching kate

Register metatype used in queued invokeMethod

Otherwise we get
    QMetaMethod::invoke: Unable to handle unregistered datatype 'QPlatformWindow*'

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:372
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/184/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4133
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4161
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4001/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4001/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4001/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4001/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4001/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4001
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4001/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/184/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Looks fine. Strange that it worked without.

review: Approve

=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
--- src/ubuntumirclient/qmirclientwindow.cpp	2017-02-17 14:36:00 +0000
+++ src/ubuntumirclient/qmirclientwindow.cpp	2017-02-17 14:36:00 +0000
@@ -719,6 +719,8 @@
     return mPersistentIdStr;
 }
 
+Q_DECLARE_METATYPE(QPlatformWindow*)
+
 QMirClientWindow::QMirClientWindow(QWindow *w, QMirClientInput *input, QMirClientNativeInterface *native,
                                    QMirClientAppStateController *appState, EGLDisplay eglDisplay,
                                    MirConnection *mirConnection, QMirClientDebugExtension *debugExt)
@@ -735,6 +737,12 @@
     , mScale(1.0)
     , mFormFactor(mir_form_factor_unknown)
 {
+    static bool metaTypeRegistered = false;
+    if (Q_UNLIKELY(!metaTypeRegistered)) {
+        qRegisterMetaType<QPlatformWindow*>();
+        metaTypeRegistered = true;
+    }
+
     mWindowExposed = mSurface->mNeedsExposeCatchup == false;
 
     qCDebug(mirclient, "QMirClientWindow(window=%p, screen=%p, input=%p, surf=%p) with title '%s', role: '%d'",