unity-mir

Merge lp:~aacid/unity-mir/fix_qmir_server_app_check into lp:unity-mir

  1. fix_qmir_server_app_check
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~aacid/unity-mir/fix_qmir_server_app_check
Merge into: lp:unity-mir
Diff against target: 32 lines (+4/-2)
2 files modified
src/modules/Unity/ApplicationManager/application_manager.cpp (+2/-1)
src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp (+2/-1)
To merge this branch: bzr merge lp:~aacid/unity-mir/fix_qmir_server_app_check
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+180822@code.launchpad.net

Commit message

Fix QMirServerApplication check

To post a comment you must log in.
lp:~aacid/unity-mir/fix_qmir_server_app_check updated
40. By Albert Astals Cid

Fix QMirServerApplication check

41. By Albert Astals Cid

Fix static->dynamic cast here too

Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM, waiting for Jenkins

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/16/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/17/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
2--- src/modules/Unity/ApplicationManager/application_manager.cpp 2013-08-15 18:10:19 +0000
3+++ src/modules/Unity/ApplicationManager/application_manager.cpp 2013-08-19 10:10:25 +0000
4@@ -50,10 +50,11 @@
5 {
6 DLOG("ApplicationManager::ApplicationManager (this=%p)", this);
7
8- QMirServerApplication* mirServerApplication = static_cast<QMirServerApplication*>(QCoreApplication::instance());
9+ QMirServerApplication* mirServerApplication = dynamic_cast<QMirServerApplication*>(QCoreApplication::instance());
10 if (mirServerApplication == NULL) {
11 LOG("Need to use QMirServerApplication");
12 QCoreApplication::quit();
13+ return;
14 }
15 m_mirServer = mirServerApplication->server();
16
17
18=== modified file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp'
19--- src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp 2013-08-09 13:16:13 +0000
20+++ src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp 2013-08-19 10:10:25 +0000
21@@ -47,10 +47,11 @@
22 {
23 DLOG("MirSurfaceManager::MirSurfaceManager (this=%p)", this);
24
25- QMirServerApplication* mirServerApplication = static_cast<QMirServerApplication*>(QCoreApplication::instance());
26+ QMirServerApplication* mirServerApplication = dynamic_cast<QMirServerApplication*>(QCoreApplication::instance());
27 if (mirServerApplication == NULL) {
28 LOG("Need to use QMirServerApplication");
29 QCoreApplication::quit();
30+ return;
31 }
32 m_mirServer = mirServerApplication->server();
33

Subscribers

People subscribed via source and target branches