qtubuntu

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

  1. fixImageConvert
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 379
Merged at revision: 382
Proposed branch: lp:~aacid/qtubuntu/fixImageConvert
Merge into: lp:qtubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
src/ubuntumirclient/qmirclientcursor.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu/fixImageConvert
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+319900@code.launchpad.net

Commit message

fix image conversion to Format_ARGB32

Description of the change

the convertToFormat function is const

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Yup, nice catch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/qmirclientcursor.cpp'
2--- src/ubuntumirclient/qmirclientcursor.cpp 2017-02-07 16:16:54 +0000
3+++ src/ubuntumirclient/qmirclientcursor.cpp 2017-03-15 09:02:20 +0000
4@@ -175,7 +175,7 @@
5 QImage image = cursor.pixmap().toImage();
6
7 if (image.format() != QImage::Format_ARGB32) {
8- image.convertToFormat(QImage::Format_ARGB32);
9+ image = image.convertToFormat(QImage::Format_ARGB32);
10 }
11
12 MirBufferStream *bufferStream = mir_connection_create_buffer_stream_sync(mConnection,

Subscribers

People subscribed via source and target branches