Unity 8

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

  1. noQtQmlHeader
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 537
Merged at revision: 542
Proposed branch: lp:~aacid/unity8/noQtQmlHeader
Merge into: lp:unity8
Diff against target: 51 lines (+4/-4)
4 files modified
plugins/AccountsService/plugin.cpp (+1/-1)
plugins/SessionBroadcast/plugin.cpp (+1/-1)
tests/mocks/AccountsService/plugin.cpp (+1/-1)
tests/mocks/QMenuModel/plugin.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/noQtQmlHeader
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+195825@code.launchpad.net

Commit message

Do not include the QtQml megaheader

Include only qqml.h which is what we need in these files

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

As long as CI says it's ok, it is.

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

FAILED: Continuous integration, rev:537
http://jenkins.qa.ubuntu.com/job/unity8-ci/1673/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/861
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/305/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/197
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/873
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/873/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/861
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/861/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3462
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1551

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

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/727/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/874
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/113
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/891
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/891/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/874
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/874/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3475
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1564

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/733/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3325
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/880/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/119
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/119
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/808/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/897
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/897/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/880
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/880/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3482/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1571

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/735/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3330
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/882/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/121
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/121
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/809/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/899
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/899/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/882/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3483/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1572

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/736/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3335
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/909/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/892
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/122
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/122
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/819/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/909
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/892
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/892/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3493
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1583

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/AccountsService/plugin.cpp'
2--- plugins/AccountsService/plugin.cpp 2013-09-05 18:09:41 +0000
3+++ plugins/AccountsService/plugin.cpp 2013-11-19 17:08:24 +0000
4@@ -20,7 +20,7 @@
5 #include "AccountsService.h"
6
7 #include <QDBusMetaType>
8-#include <QtQml>
9+#include <QtQml/qqml.h>
10
11 static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
12 {
13
14=== modified file 'plugins/SessionBroadcast/plugin.cpp'
15--- plugins/SessionBroadcast/plugin.cpp 2013-09-12 17:58:21 +0000
16+++ plugins/SessionBroadcast/plugin.cpp 2013-11-19 17:08:24 +0000
17@@ -19,7 +19,7 @@
18 #include "plugin.h"
19 #include "SessionBroadcast.h"
20
21-#include <QtQml>
22+#include <QtQml/qqml.h>
23
24 static QObject *broadcast_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
25 {
26
27=== modified file 'tests/mocks/AccountsService/plugin.cpp'
28--- tests/mocks/AccountsService/plugin.cpp 2013-09-05 18:09:41 +0000
29+++ tests/mocks/AccountsService/plugin.cpp 2013-11-19 17:08:24 +0000
30@@ -20,7 +20,7 @@
31 #include "plugin.h"
32 #include "AccountsService.h"
33
34-#include <QtQml>
35+#include <QtQml/qqml.h>
36
37 static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
38 {
39
40=== modified file 'tests/mocks/QMenuModel/plugin.cpp'
41--- tests/mocks/QMenuModel/plugin.cpp 2013-10-11 17:16:52 +0000
42+++ tests/mocks/QMenuModel/plugin.cpp 2013-11-19 17:08:24 +0000
43@@ -20,7 +20,7 @@
44 #include "unitymenumodel.h"
45 #include "actionstateparser.h"
46
47-#include <QtQml>
48+#include <QtQml/qqml.h>
49
50 void QMenuModelPlugin::registerTypes(const char *uri)
51 {

Subscribers

People subscribed via source and target branches