Merge lp:~juhapekka-piiroinen/ubuntu-ui-toolkit/fix-missing-license-headers into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/experimental

Proposed by Juhapekka Piiroinen
Status: Merged
Approved by: Juhapekka Piiroinen
Approved revision: 290
Merged at revision: 290
Proposed branch: lp:~juhapekka-piiroinen/ubuntu-ui-toolkit/fix-missing-license-headers
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/experimental
Diff against target: 192 lines (+128/-1)
8 files modified
modules/Ubuntu/Components/Popups/Pointer.qml (+16/-0)
modules/Ubuntu/Components/TextCustom.qml (+17/-1)
tests/unit/tst_components/tst_modelsectioncounter.qml (+16/-0)
tests/unit/tst_components/tst_popups_composersheet.qml (+16/-0)
tests/unit/tst_components/tst_popups_defaultsheet.qml (+16/-0)
tests/unit/tst_components/tst_popups_dialog.qml (+16/-0)
tests/unit/tst_components/tst_popups_popover.qml (+15/-0)
tests/unit/tst_components/tst_scrollbar.qml (+16/-0)
To merge this branch: bzr merge lp:~juhapekka-piiroinen/ubuntu-ui-toolkit/fix-missing-license-headers
Reviewer Review Type Date Requested Status
Juhapekka Piiroinen (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+144233@code.launchpad.net

Description of the change

add missing license headers

To post a comment you must log in.
Revision history for this message
Juhapekka Piiroinen (juhapekka-piiroinen) wrote :

Lets wait for awhile to confirm that the CI job gets triggered. DO NOT ACCEPT, yet.

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

Approved as it was approved for the trunk by zsombi. Now we will wait and see the autolanding for the experimental branch.

Revision history for this message
Juhapekka Piiroinen (juhapekka-piiroinen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Popups/Pointer.qml'
2--- modules/Ubuntu/Components/Popups/Pointer.qml 2012-11-15 15:40:53 +0000
3+++ modules/Ubuntu/Components/Popups/Pointer.qml 2013-01-22 07:21:23 +0000
4@@ -1,3 +1,19 @@
5+/*
6+ * Copyright 2012 Canonical Ltd.
7+ *
8+ * This program is free software; you can redistribute it and/or modify
9+ * it under the terms of the GNU Lesser General Public License as published by
10+ * the Free Software Foundation; version 3.
11+ *
12+ * This program is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+ * GNU Lesser General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU Lesser General Public License
18+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
19+ */
20+
21 import QtQuick 2.0
22 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
23 // we need to use named imports otherwise namespace collision is reported
24
25=== modified file 'modules/Ubuntu/Components/TextCustom.qml'
26--- modules/Ubuntu/Components/TextCustom.qml 2012-11-29 18:13:17 +0000
27+++ modules/Ubuntu/Components/TextCustom.qml 2013-01-22 07:21:23 +0000
28@@ -1,4 +1,20 @@
29-import QtQuick 2.0
30+/*
31+ * Copyright 2012 Canonical Ltd.
32+ *
33+ * This program is free software; you can redistribute it and/or modify
34+ * it under the terms of the GNU Lesser General Public License as published by
35+ * the Free Software Foundation; version 3.
36+ *
37+ * This program is distributed in the hope that it will be useful,
38+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
39+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
40+ * GNU Lesser General Public License for more details.
41+ *
42+ * You should have received a copy of the GNU Lesser General Public License
43+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
44+ */
45+
46+ import QtQuick 2.0
47
48 /*!
49 \qmltype TextCustom
50
51=== modified file 'tests/unit/tst_components/tst_modelsectioncounter.qml'
52--- tests/unit/tst_components/tst_modelsectioncounter.qml 2013-01-09 13:58:22 +0000
53+++ tests/unit/tst_components/tst_modelsectioncounter.qml 2013-01-22 07:21:23 +0000
54@@ -1,3 +1,19 @@
55+/*
56+ * Copyright 2012 Canonical Ltd.
57+ *
58+ * This program is free software; you can redistribute it and/or modify
59+ * it under the terms of the GNU Lesser General Public License as published by
60+ * the Free Software Foundation; version 3.
61+ *
62+ * This program is distributed in the hope that it will be useful,
63+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
64+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
65+ * GNU Lesser General Public License for more details.
66+ *
67+ * You should have received a copy of the GNU Lesser General Public License
68+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
69+ */
70+
71 import QtQuick 2.0
72 import QtTest 1.0
73 import Ubuntu.Components 0.1
74
75=== modified file 'tests/unit/tst_components/tst_popups_composersheet.qml'
76--- tests/unit/tst_components/tst_popups_composersheet.qml 2012-11-15 18:07:25 +0000
77+++ tests/unit/tst_components/tst_popups_composersheet.qml 2013-01-22 07:21:23 +0000
78@@ -1,3 +1,19 @@
79+/*
80+ * Copyright 2012 Canonical Ltd.
81+ *
82+ * This program is free software; you can redistribute it and/or modify
83+ * it under the terms of the GNU Lesser General Public License as published by
84+ * the Free Software Foundation; version 3.
85+ *
86+ * This program is distributed in the hope that it will be useful,
87+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
88+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
89+ * GNU Lesser General Public License for more details.
90+ *
91+ * You should have received a copy of the GNU Lesser General Public License
92+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
93+ */
94+
95 import QtQuick 2.0
96 import QtTest 1.0
97 import Ubuntu.Components 0.1
98
99=== modified file 'tests/unit/tst_components/tst_popups_defaultsheet.qml'
100--- tests/unit/tst_components/tst_popups_defaultsheet.qml 2012-11-15 18:07:25 +0000
101+++ tests/unit/tst_components/tst_popups_defaultsheet.qml 2013-01-22 07:21:23 +0000
102@@ -1,3 +1,19 @@
103+/*
104+ * Copyright 2012 Canonical Ltd.
105+ *
106+ * This program is free software; you can redistribute it and/or modify
107+ * it under the terms of the GNU Lesser General Public License as published by
108+ * the Free Software Foundation; version 3.
109+ *
110+ * This program is distributed in the hope that it will be useful,
111+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
112+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
113+ * GNU Lesser General Public License for more details.
114+ *
115+ * You should have received a copy of the GNU Lesser General Public License
116+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
117+ */
118+
119 import QtQuick 2.0
120 import QtTest 1.0
121 import Ubuntu.Components 0.1
122
123=== modified file 'tests/unit/tst_components/tst_popups_dialog.qml'
124--- tests/unit/tst_components/tst_popups_dialog.qml 2012-11-15 13:13:40 +0000
125+++ tests/unit/tst_components/tst_popups_dialog.qml 2013-01-22 07:21:23 +0000
126@@ -1,3 +1,19 @@
127+/*
128+ * Copyright 2012 Canonical Ltd.
129+ *
130+ * This program is free software; you can redistribute it and/or modify
131+ * it under the terms of the GNU Lesser General Public License as published by
132+ * the Free Software Foundation; version 3.
133+ *
134+ * This program is distributed in the hope that it will be useful,
135+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
136+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
137+ * GNU Lesser General Public License for more details.
138+ *
139+ * You should have received a copy of the GNU Lesser General Public License
140+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
141+ */
142+
143 import QtQuick 2.0
144 import QtTest 1.0
145 import Ubuntu.Components 0.1
146
147=== modified file 'tests/unit/tst_components/tst_popups_popover.qml'
148--- tests/unit/tst_components/tst_popups_popover.qml 2012-11-15 13:13:40 +0000
149+++ tests/unit/tst_components/tst_popups_popover.qml 2013-01-22 07:21:23 +0000
150@@ -1,3 +1,18 @@
151+/*
152+ * Copyright 2012 Canonical Ltd.
153+ *
154+ * This program is free software; you can redistribute it and/or modify
155+ * it under the terms of the GNU Lesser General Public License as published by
156+ * the Free Software Foundation; version 3.
157+ *
158+ * This program is distributed in the hope that it will be useful,
159+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
160+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
161+ * GNU Lesser General Public License for more details.
162+ *
163+ * You should have received a copy of the GNU Lesser General Public License
164+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
165+ */
166 import QtQuick 2.0
167 import QtTest 1.0
168 import Ubuntu.Components 0.1
169
170=== modified file 'tests/unit/tst_components/tst_scrollbar.qml'
171--- tests/unit/tst_components/tst_scrollbar.qml 2013-01-08 09:50:42 +0000
172+++ tests/unit/tst_components/tst_scrollbar.qml 2013-01-22 07:21:23 +0000
173@@ -1,3 +1,19 @@
174+/*
175+ * Copyright 2012 Canonical Ltd.
176+ *
177+ * This program is free software; you can redistribute it and/or modify
178+ * it under the terms of the GNU Lesser General Public License as published by
179+ * the Free Software Foundation; version 3.
180+ *
181+ * This program is distributed in the hope that it will be useful,
182+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
183+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
184+ * GNU Lesser General Public License for more details.
185+ *
186+ * You should have received a copy of the GNU Lesser General Public License
187+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
188+ */
189+
190 import QtQuick 2.0
191 import QtTest 1.0
192 import Ubuntu.Components 0.1

Subscribers

People subscribed via source and target branches