Merge lp:~alan-griffiths/qtmir/future-proof into lp:qtmir

Proposed by Alan Griffiths on 2017-03-21
Status: Merged
Approved by: Gerry Boland on 2017-03-21
Approved revision: no longer in the source branch.
Merged at revision: 633
Proposed branch: lp:~alan-griffiths/qtmir/future-proof
Merge into: lp:qtmir
Diff against target: 16 lines (+5/-0)
1 file modified
src/platforms/mirserver/qmirserver_p.cpp (+5/-0)
To merge this branch: bzr merge lp:~alan-griffiths/qtmir/future-proof
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2017-03-21 Approve on 2017-03-21
Unity8 CI Bot continuous-integration Approve on 2017-03-21
Review via email: mp+320466@code.launchpad.net

Commit message

MirAL will be correcting another spelling error shortly. Avoid an FTBFS when that happens.

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/603/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4581
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4609
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4436/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Gerry Boland (gerboland) :
review: Approve
626. By Lukáš Tinkl on 2017-03-28

Raise (activate) windows when an app focus is requested (LP: #1672337)

Approved by: Daniel d'Andrada, Unity8 CI Bot

627. By Albert Astals Cid on 2017-03-28

Remove empty property and move invokable

They are not part of the interface and not used by unity8 either

Approved by: Gerry Boland, Unity8 CI Bot

628. By Albert Astals Cid on 2017-03-28

Run ApplicationManager::authorizeSession in the calling thread

Instead of using a BlockingQueuedConnection

This fixes the deadlock we have when we are creating a player that uses gstreamer and
gstreamer needs to update its registry (which blocks waiting for an external process to finish)
and that external process tries to connect to mir.

Adds a QMutex in ApplicationManager that protects the public functions and slots

The mutex needs to be recursive since for example beginInsertRows call in add() will call rowCount()

The setPid/addApp functions are still run through a queued signal so that the model/QObjects are still all handled in the main thread.

findApplicationMutexHeld is not really necessary since the mutex is recursive but thought it's better to leave the recursive use for when it's really needed (LP: #1525285)

Approved by: Gerry Boland, Unity8 CI Bot

629. By Gerry Boland on 2017-03-28

Don't let a child window go offscreen because its parent moved

Approved by: Daniel d'Andrada, Unity8 CI Bot

630. By Daniel d'Andrada on 2017-03-28

Ensure the window that got a key down also gets the corresponding key up

Otherwise it will be left in a inconsistent state (with a pressed key hanging around).

QQuickWindow's input dispatching doesn't guarantee that for its QQuickItem.
So we have to do it ourselves.

This can happen when qml active focus changes in response to a key press.
Eg: client creates a child window in response to a Ctrl+O. By the time the user
releases the Ctrl, active focus will already be in the child window, so the child window
will get the release event instead of the top-level one. (LP: #1671072)

Approved by: Gerry Boland, Unity8 CI Bot

631. By Gerry Boland on 2017-03-28

Add env var equivalent to desktop_file_hint

Approved by: Daniel d'Andrada, Unity8 CI Bot

632. By Andreas Pokorny on 2017-03-28

Report and consume exception that may occur on constructing a keymap (LP: #1557634)

Approved by: Daniel d'Andrada, Unity8 CI Bot

633. By Alan Griffiths on 2017-03-28

MirAL will be correcting another spelling error shortly. Avoid an FTBFS when that happens.

Approved by: Gerry Boland, Unity8 CI Bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
2--- src/platforms/mirserver/qmirserver_p.cpp 2017-03-20 12:18:04 +0000
3+++ src/platforms/mirserver/qmirserver_p.cpp 2017-03-21 09:35:39 +0000
4@@ -29,7 +29,12 @@
5 // miral
6 #include <miral/add_init_callback.h>
7 #include <miral/set_terminator.h>
8+#include <miral/version.h>
9+#if MIRAL_VERSION > MIR_VERSION_NUMBER(1,3,1)
10+#include <miral/set_window_management_policy.h>
11+#else
12 #include <miral/set_window_managment_policy.h>
13+#endif
14
15 // Qt
16 #include <QCoreApplication>

Subscribers

People subscribed via source and target branches