QtMir

Merge lp:~faenil/qtmir/add_missing_default_return_value into lp:qtmir

  1. add_missing_default_return_value
  2. Merge into trunk
Proposed by Andrea Bernabei on 2016-09-05
Status: Merged
Approved by: Daniel d'Andrada on 2016-09-05
Approved revision: 559
Merged at revision: 567
Proposed branch: lp:~faenil/qtmir/add_missing_default_return_value
Merge into: lp:qtmir
Diff against target: 11 lines (+1/-0)
1 file modified
src/platforms/mirserver/screen.cpp (+1/-0)
To merge this branch: bzr merge lp:~faenil/qtmir/add_missing_default_return_value
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) 2016-09-05 Approve on 2016-09-05
Review via email: mp+304945@code.launchpad.net

Commit Message

Add missing default return value to qImageFormatFromMirPixelFormat

Description of the Change

This is part of the set up of the instrumented libraries PPA.

Building QtMir with
-DCMAKE_CXX_FLAGS="-finstrument-functions -fno-omit-frame-pointer -g -finstrument-functions-exclude-function-list=load,store ${CMAKE_CXX_FLAGS}"
results in a failure because of a missing return value.

This MR adds the missing return.

To post a comment you must log in.
Daniel d'Andrada (dandrader) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
No. Just built and run the tests.

* Did CI run pass? If not, please explain why.
No results yet, but tests pass locally.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mirserver/screen.cpp'
2--- src/platforms/mirserver/screen.cpp 2016-08-16 11:04:25 +0000
3+++ src/platforms/mirserver/screen.cpp 2016-09-05 17:01:16 +0000
4@@ -94,6 +94,7 @@
5 qFatal("[mirserver QPA] Unknown mir pixel format");
6 break;
7 }
8+ return QImage::Format_Invalid;
9 }
10
11 QString displayTypeToString(enum mir::graphics::DisplayConfigurationOutputType type)

Subscribers

People subscribed via source and target branches