qtubuntu

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

  1. build_with_clang
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 381
Merged at revision: 383
Proposed branch: lp:~aacid/qtubuntu/build_with_clang
Merge into: lp:qtubuntu
Prerequisite: lp:~aacid/qtubuntu/fixImageConvert
Diff against target: 63 lines (+6/-6)
4 files modified
src/ubuntuappmenu/gmenumodelplatformmenu.h (+2/-2)
src/ubuntumirclient/qmirclientintegration.h (+1/-1)
src/ubuntumirclient/qmirclientwindow.cpp (+2/-2)
src/ubuntumirclient/qmirclientwindow.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu/build_with_clang
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+319904@code.launchpad.net

Commit message

Build with clang

The std::move removal is because of this error
  moving a local object in a return statement prevents copy elision

To post a comment you must log in.
lp:~aacid/qtubuntu/build_with_clang updated
380. By Albert Astals Cid

Merge lp:~aacid/qtubuntu/fixImageConvert

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/207/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4460
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4317/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4317/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4317/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4317/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4317/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4317
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4317/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
lp:~aacid/qtubuntu/build_with_clang updated
381. By Albert Astals Cid

fix nasty c&p error

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

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

LGTM, CI agrees too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.h'
2--- src/ubuntuappmenu/gmenumodelplatformmenu.h 2016-12-09 17:04:05 +0000
3+++ src/ubuntuappmenu/gmenumodelplatformmenu.h 2017-03-15 11:04:18 +0000
4@@ -89,9 +89,9 @@
5 virtual void setMinimumWidth(int width) override;
6 virtual void setFont(const QFont &font) override;
7
8- virtual void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item);
9+ virtual void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
10
11- virtual void dismiss(); // Closes this and all its related menu popups
12+ virtual void dismiss() override; // Closes this and all its related menu popups
13
14 virtual QPlatformMenuItem *menuItemAt(int position) const override;
15 virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
16
17=== modified file 'src/ubuntumirclient/qmirclientintegration.h'
18--- src/ubuntumirclient/qmirclientintegration.h 2017-02-07 15:37:20 +0000
19+++ src/ubuntumirclient/qmirclientintegration.h 2017-03-15 11:04:18 +0000
20@@ -58,7 +58,7 @@
21 class QMirClientInput;
22 class QMirClientNativeInterface;
23 class QMirClientScreen;
24-class MirConnection;
25+struct MirConnection;
26
27 class QMirClientClientIntegration : public QObject, public QPlatformIntegration
28 {
29
30=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
31--- src/ubuntumirclient/qmirclientwindow.cpp 2017-03-08 11:58:41 +0000
32+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-03-15 11:04:18 +0000
33@@ -272,7 +272,7 @@
34 qCDebug(mirclient, "makeSurfaceSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",
35 window, mirWindowTypeToStr(type), window->type(), location.left, location.top, width, height);
36
37- return std::move(spec);
38+ return spec;
39 }
40
41 void setSizingConstraints(MirWindowSpec *spec, const QSize& minSize, const QSize& maxSize, const QSize& increment)
42@@ -706,7 +706,7 @@
43
44 void UbuntuSurface::setMask(const QRegion &region)
45 {
46- qCDebug(mirclient, "setMask(window=%p, region=%s)", mWindow, region);
47+ qCDebug(mirclient).nospace() << "setMask(window=" << mWindow << ", region=" << region << ")";
48
49 Spec spec{mir_create_window_spec(mConnection)};
50 ::setMask(spec.get(), region);
51
52=== modified file 'src/ubuntumirclient/qmirclientwindow.h'
53--- src/ubuntumirclient/qmirclientwindow.h 2017-02-22 22:16:08 +0000
54+++ src/ubuntumirclient/qmirclientwindow.h 2017-03-15 11:04:18 +0000
55@@ -58,7 +58,7 @@
56 class QMirClientInput;
57 class QMirClientScreen;
58 class UbuntuSurface;
59-class MirConnection;
60+struct MirConnection;
61
62 class QMirClientWindow : public QObject, public QPlatformWindow
63 {

Subscribers

People subscribed via source and target branches