1
=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
2
--- src/ubuntumirclient/qmirclientwindow.cpp	2017-02-17 14:36:00 +0000
3
+++ src/ubuntumirclient/qmirclientwindow.cpp	2017-02-17 14:36:00 +0000
4
@@ -719,6 +719,8 @@
5
719
    return mPersistentIdStr;
719
    return mPersistentIdStr;
6
720
}
720
}
7
721
721
8
722
Q_DECLARE_METATYPE(QPlatformWindow*)
9
723
10
722
QMirClientWindow::QMirClientWindow(QWindow *w, QMirClientInput *input, QMirClientNativeInterface *native,
724
QMirClientWindow::QMirClientWindow(QWindow *w, QMirClientInput *input, QMirClientNativeInterface *native,
11
723
                                   QMirClientAppStateController *appState, EGLDisplay eglDisplay,
725
                                   QMirClientAppStateController *appState, EGLDisplay eglDisplay,
12
724
                                   MirConnection *mirConnection, QMirClientDebugExtension *debugExt)
726
                                   MirConnection *mirConnection, QMirClientDebugExtension *debugExt)
13
@@ -735,6 +737,12 @@
14
735
    , mScale(1.0)
737
    , mScale(1.0)
15
736
    , mFormFactor(mir_form_factor_unknown)
738
    , mFormFactor(mir_form_factor_unknown)
16
737
{
739
{
17
740
    static bool metaTypeRegistered = false;
18
741
    if (Q_UNLIKELY(!metaTypeRegistered)) {
19
742
        qRegisterMetaType<QPlatformWindow*>();
20
743
        metaTypeRegistered = true;
21
744
    }
22
745
23
738
    mWindowExposed = mSurface->mNeedsExposeCatchup == false;
746
    mWindowExposed = mSurface->mNeedsExposeCatchup == false;
24
739
747
25
740
    qCDebug(mirclient, "QMirClientWindow(window=%p, screen=%p, input=%p, surf=%p) with title '%s', role: '%d'",
748
    qCDebug(mirclient, "QMirClientWindow(window=%p, screen=%p, input=%p, surf=%p) with title '%s', role: '%d'",
Status:	Merged
Approved by:	Nick Dedekind on 2017-02-17
Approved revision:	372
Merged at revision:	374
Proposed branch:	lp:~aacid/qtubuntu/fix_unregistered_metatype_warning
Merge into:	lp:qtubuntu
Prerequisite:	lp:~ci-train-bot/qtubuntu/qtubuntu-ubuntu-zesty-2415.1
Diff against target:	25 lines (+8/-0) 1 file modified src/ubuntumirclient/qmirclientwindow.cpp (+8/-0)
To merge this branch:	bzr merge lp:~aacid/qtubuntu/fix_unregistered_metatype_warning
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Nick Dedekind (community)		2017-02-17	Approve on 2017-02-17
Unity8 CI Bot	continuous-integration		Approve on 2017-02-17
Review via email: mp+317633@code.launchpad.net