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
=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.h'
--- src/ubuntuappmenu/gmenumodelplatformmenu.h 2016-12-09 17:04:05 +0000
+++ src/ubuntuappmenu/gmenumodelplatformmenu.h 2017-03-15 11:04:18 +0000
@@ -89,9 +89,9 @@
89 virtual void setMinimumWidth(int width) override;89 virtual void setMinimumWidth(int width) override;
90 virtual void setFont(const QFont &font) override;90 virtual void setFont(const QFont &font) override;
9191
92 virtual void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item);92 virtual void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
9393
94 virtual void dismiss(); // Closes this and all its related menu popups94 virtual void dismiss() override; // Closes this and all its related menu popups
9595
96 virtual QPlatformMenuItem *menuItemAt(int position) const override;96 virtual QPlatformMenuItem *menuItemAt(int position) const override;
97 virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const override;97 virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
9898
=== modified file 'src/ubuntumirclient/qmirclientintegration.h'
--- src/ubuntumirclient/qmirclientintegration.h 2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientintegration.h 2017-03-15 11:04:18 +0000
@@ -58,7 +58,7 @@
58class QMirClientInput;58class QMirClientInput;
59class QMirClientNativeInterface;59class QMirClientNativeInterface;
60class QMirClientScreen;60class QMirClientScreen;
61class MirConnection;61struct MirConnection;
6262
63class QMirClientClientIntegration : public QObject, public QPlatformIntegration63class QMirClientClientIntegration : public QObject, public QPlatformIntegration
64{64{
6565
=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
--- src/ubuntumirclient/qmirclientwindow.cpp 2017-03-08 11:58:41 +0000
+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-03-15 11:04:18 +0000
@@ -272,7 +272,7 @@
272 qCDebug(mirclient, "makeSurfaceSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",272 qCDebug(mirclient, "makeSurfaceSpec(window=%p): %s spec (type=0x%x, position=(%d, %d)px, size=(%dx%d)px)",
273 window, mirWindowTypeToStr(type), window->type(), location.left, location.top, width, height);273 window, mirWindowTypeToStr(type), window->type(), location.left, location.top, width, height);
274274
275 return std::move(spec);275 return spec;
276}276}
277277
278void setSizingConstraints(MirWindowSpec *spec, const QSize& minSize, const QSize& maxSize, const QSize& increment)278void setSizingConstraints(MirWindowSpec *spec, const QSize& minSize, const QSize& maxSize, const QSize& increment)
@@ -706,7 +706,7 @@
706706
707void UbuntuSurface::setMask(const QRegion &region)707void UbuntuSurface::setMask(const QRegion &region)
708{708{
709 qCDebug(mirclient, "setMask(window=%p, region=%s)", mWindow, region);709 qCDebug(mirclient).nospace() << "setMask(window=" << mWindow << ", region=" << region << ")";
710710
711 Spec spec{mir_create_window_spec(mConnection)};711 Spec spec{mir_create_window_spec(mConnection)};
712 ::setMask(spec.get(), region);712 ::setMask(spec.get(), region);
713713
=== modified file 'src/ubuntumirclient/qmirclientwindow.h'
--- src/ubuntumirclient/qmirclientwindow.h 2017-02-22 22:16:08 +0000
+++ src/ubuntumirclient/qmirclientwindow.h 2017-03-15 11:04:18 +0000
@@ -58,7 +58,7 @@
58class QMirClientInput;58class QMirClientInput;
59class QMirClientScreen;59class QMirClientScreen;
60class UbuntuSurface;60class UbuntuSurface;
61class MirConnection;61struct MirConnection;
6262
63class QMirClientWindow : public QObject, public QPlatformWindow63class QMirClientWindow : public QObject, public QPlatformWindow
64{64{

Subscribers

People subscribed via source and target branches