Unity 8

Merge lp:~aacid/unity8/disablePedanticQtPrivateHeaders into lp:unity8

  1. disablePedanticQtPrivateHeaders
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 91
Merged at revision: 94
Proposed branch: lp:~aacid/unity8/disablePedanticQtPrivateHeaders
Merge into: lp:unity8
Diff against target: 67 lines (+12/-0)
4 files modified
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp (+3/-0)
plugins/ListViewWithPageHeader/listviewwithpageheader.h (+3/-0)
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp (+3/-0)
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp (+3/-0)
To merge this branch: bzr merge lp:~aacid/unity8/disablePedanticQtPrivateHeaders
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+173755@code.launchpad.net

Commit message

Disable -pedantic on the private Qt headers

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

yay! works fine.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Smarts :)

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

\o/

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

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/unity8-ci/196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/196
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/892
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/892/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/766

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/196/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/56/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/723
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/899/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/56
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/56/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/903/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/59/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/518
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/914
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/914/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/781

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Updated panda-9 with latest pbuilder hooks and trying again...

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/61/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/732
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/915
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/61
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/919/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/786

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/63/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/920
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/63
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/791

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

removed ubuntu-ui-toolkit ppa which breaks the panel in the latest revision.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/64/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/530
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/64/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/793

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.cpp'
2--- plugins/ListViewWithPageHeader/listviewwithpageheader.cpp 2013-07-02 08:45:40 +0000
3+++ plugins/ListViewWithPageHeader/listviewwithpageheader.cpp 2013-07-09 15:33:39 +0000
4@@ -94,10 +94,13 @@
5 #include <QDebug>
6 #include <qqmlinfo.h>
7 #include <qqmlengine.h>
8+#pragma GCC diagnostic push
9+#pragma GCC diagnostic ignored "-pedantic"
10 #include <private/qquickvisualdatamodel_p.h>
11 #include <private/qqmlglobal_p.h>
12 #include <private/qquickitem_p.h>
13 #include <private/qquickanimation_p.h>
14+#pragma GCC diagnostic pop
15 // #include <private/qquickrectangle_p.h>
16
17 static const qreal bufferRatio = 0.5;
18
19=== modified file 'plugins/ListViewWithPageHeader/listviewwithpageheader.h'
20--- plugins/ListViewWithPageHeader/listviewwithpageheader.h 2013-07-01 11:19:49 +0000
21+++ plugins/ListViewWithPageHeader/listviewwithpageheader.h 2013-07-09 15:33:39 +0000
22@@ -17,8 +17,11 @@
23 #ifndef LISTVIEWWITHPAGEHEADER_H
24 #define LISTVIEWWITHPAGEHEADER_H
25
26+#pragma GCC diagnostic push
27+#pragma GCC diagnostic ignored "-pedantic"
28 #include <private/qquickitemchangelistener_p.h>
29 #include <private/qquickflickable_p.h>
30+#pragma GCC diagnostic pop
31
32 class QAbstractItemModel;
33 class QQuickChangeSet;
34
35=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp'
36--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp 2013-07-02 09:57:41 +0000
37+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp 2013-07-09 15:33:39 +0000
38@@ -20,9 +20,12 @@
39 #include <QQmlEngine>
40 #include <QQuickView>
41 #include <QtTestGui>
42+#pragma GCC diagnostic push
43+#pragma GCC diagnostic ignored "-pedantic"
44 #include <private/qquicklistmodel_p.h>
45 #include <private/qquickanimation_p.h>
46 #include <private/qquickitem_p.h>
47+#pragma GCC diagnostic pop
48
49 class ListViewWithPageHeaderTest : public QObject
50 {
51
52=== modified file 'tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp'
53--- tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp 2013-06-28 07:40:47 +0000
54+++ tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp 2013-07-09 15:33:39 +0000
55@@ -20,9 +20,12 @@
56 #include <QQmlEngine>
57 #include <QQuickView>
58 #include <QtTestGui>
59+#pragma GCC diagnostic push
60+#pragma GCC diagnostic ignored "-pedantic"
61 #include <private/qquicklistmodel_p.h>
62 #include <private/qquickanimation_p.h>
63 #include <private/qquickitem_p.h>
64+#pragma GCC diagnostic pop
65
66 class ListViewWithPageHeaderTestSection : public QObject
67 {

Subscribers

People subscribed via source and target branches