Unity

Merge lp:~mzanetti/unity/phablet-copyright-headers into lp:unity/phablet

  1. phablet-copyright-headers
  2. Merge into phablet
Proposed by Michael Zanetti
Status: Merged
Approved by: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 558
Proposed branch: lp:~mzanetti/unity/phablet-copyright-headers
Merge into: lp:unity/phablet
Diff against target: 191 lines (+128/-0)
8 files modified
Bottombar/Bottombar.qml (+16/-0)
Bottombar/HudButton.qml (+16/-0)
Components/ApplicationImageFake.qml (+16/-0)
Components/ApplicationImageWrapper.qml (+16/-0)
Components/ResponsiveFlowView.qml (+16/-0)
Dash/Video/VideoInfo.qml (+16/-0)
VolumeControl.qml (+16/-0)
tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml (+16/-0)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-copyright-headers
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+157858@code.launchpad.net

Commit message

added missing copyright headers

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good

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

PASSED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/368/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/369
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/369/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/777

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

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

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/146/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/146
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/80
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/782

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
=== modified file 'Bottombar/Bottombar.qml'
--- Bottombar/Bottombar.qml 2013-02-28 12:42:00 +0000
+++ Bottombar/Bottombar.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import "../Components"18import "../Components"
3import "../Components/Math.js" as MathLocal19import "../Components/Math.js" as MathLocal
420
=== modified file 'Bottombar/HudButton.qml'
--- Bottombar/HudButton.qml 2013-02-18 15:36:17 +0000
+++ Bottombar/HudButton.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import Ubuntu.Components 0.118import Ubuntu.Components 0.1
319
420
=== modified file 'Components/ApplicationImageFake.qml'
--- Components/ApplicationImageFake.qml 2013-02-23 16:09:58 +0000
+++ Components/ApplicationImageFake.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
218
3Item {19Item {
420
=== modified file 'Components/ApplicationImageWrapper.qml'
--- Components/ApplicationImageWrapper.qml 2013-01-23 23:38:35 +0000
+++ Components/ApplicationImageWrapper.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import Ubuntu.Application 0.118import Ubuntu.Application 0.1
319
420
=== modified file 'Components/ResponsiveFlowView.qml'
--- Components/ResponsiveFlowView.qml 2013-02-12 03:01:41 +0000
+++ Components/ResponsiveFlowView.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import Ubuntu.Components 0.118import Ubuntu.Components 0.1
319
420
=== modified file 'Dash/Video/VideoInfo.qml'
--- Dash/Video/VideoInfo.qml 2013-02-11 17:33:18 +0000
+++ Dash/Video/VideoInfo.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import QtQuick.XmlListModel 2.018import QtQuick.XmlListModel 2.0
319
420
=== modified file 'VolumeControl.qml'
--- VolumeControl.qml 2013-02-15 22:55:58 +0000
+++ VolumeControl.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
2import QMenuModel 0.118import QMenuModel 0.1
319
420
=== modified file 'tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml'
--- tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml 2013-04-02 21:34:08 +0000
+++ tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml 2013-04-09 12:32:22 +0000
@@ -1,3 +1,19 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1import QtQuick 2.017import QtQuick 2.0
218
3Item {19Item {

Subscribers

People subscribed via source and target branches