Unity

Merge lp:~aacid/unity/remove_unneeded_moc_includes into lp:unity/phablet

  1. remove_unneeded_moc_includes
  2. Merge into phablet
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 573
Proposed branch: lp:~aacid/unity/remove_unneeded_moc_includes
Merge into: lp:unity/phablet
Diff against target: 54 lines (+0/-7)
6 files modified
plugins/Unity/categories.cpp (+0/-1)
plugins/Unity/categoryfilter.cpp (+0/-1)
plugins/Unity/lens.cpp (+0/-1)
plugins/Unity/lenses.cpp (+0/-1)
plugins/Utils/qsortfilterproxymodelqml.cpp (+0/-2)
plugins/Utils/ubuntuwindow.cpp (+0/-1)
To merge this branch: bzr merge lp:~aacid/unity/remove_unneeded_moc_includes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+158012@code.launchpad.net

Commit message

Remove unneeded moc includes

We only need a #include "foo.moc" if defines a Q_OBJECT class in the .cpp file itself like qsortfilterproxymodeltest.cpp does

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

If Jenkins is fine with it, it looks good to me.

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

FAILED: Continuous integration, rev:568
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/400/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/142
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/401/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/276
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/831

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/400/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Interesting ;)

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

PASSED: Continuous integration, rev:568
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/406/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/407
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/282
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/837

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/406/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/unity-phablet-autolanding/163/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/163
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/97/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/849

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Broken jenkins, retry autoland

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/Unity/categories.cpp'
2--- plugins/Unity/categories.cpp 2013-04-09 14:59:45 +0000
3+++ plugins/Unity/categories.cpp 2013-04-10 08:15:33 +0000
4@@ -181,4 +181,3 @@
5 }
6 }
7
8-#include "categories.moc"
9
10=== modified file 'plugins/Unity/categoryfilter.cpp'
11--- plugins/Unity/categoryfilter.cpp 2013-04-05 22:12:24 +0000
12+++ plugins/Unity/categoryfilter.cpp 2013-04-10 08:15:33 +0000
13@@ -44,4 +44,3 @@
14 }
15 }
16
17-#include "categoryfilter.moc"
18
19=== modified file 'plugins/Unity/lens.cpp'
20--- plugins/Unity/lens.cpp 2013-04-04 02:32:19 +0000
21+++ plugins/Unity/lens.cpp 2013-04-10 08:15:33 +0000
22@@ -337,4 +337,3 @@
23 setNoResultsHint(hint);
24 }
25
26-#include "moc_lens.cpp"
27
28=== modified file 'plugins/Unity/lenses.cpp'
29--- plugins/Unity/lenses.cpp 2013-03-28 01:55:15 +0000
30+++ plugins/Unity/lenses.cpp 2013-04-10 08:15:33 +0000
31@@ -171,4 +171,3 @@
32 delete lens;
33 }
34
35-#include "moc_lenses.cpp"
36
37=== modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
38--- plugins/Utils/qsortfilterproxymodelqml.cpp 2013-04-09 14:59:45 +0000
39+++ plugins/Utils/qsortfilterproxymodelqml.cpp 2013-04-10 08:15:33 +0000
40@@ -169,5 +169,3 @@
41 }
42 }
43
44-
45-#include "moc_qsortfilterproxymodelqml.cpp"
46
47=== modified file 'plugins/Utils/ubuntuwindow.cpp'
48--- plugins/Utils/ubuntuwindow.cpp 2012-12-06 10:31:56 +0000
49+++ plugins/Utils/ubuntuwindow.cpp 2013-04-10 08:15:33 +0000
50@@ -35,4 +35,3 @@
51 m_window->setProperty("UbuntuSurfaceRole", ubuntuSurfaceRole);
52 }
53
54-#include "moc_ubuntuwindow.cpp"

Subscribers

People subscribed via source and target branches