1
=== modified file 'CameraApp/qstorageinfo.cpp'
2
--- CameraApp/qstorageinfo.cpp	2015-01-22 16:15:08 +0000
3
+++ CameraApp/qstorageinfo.cpp	2015-01-27 14:34:46 +0000
4
@@ -5,37 +5,17 @@
5
5
**
5
**
6
6
** This file is part of the QtCore module of the Qt Toolkit.
6
** This file is part of the QtCore module of the Qt Toolkit.
7
7
**
7
**
39
8
** $QT_BEGIN_LICENSE:LGPL$
8
** This program is free software; you can redistribute it and/or modify
40
9
** Commercial License Usage
9
** it under the terms of the GNU General Public License as published by
41
10
** Licensees holding valid commercial Qt licenses may use this file in
10
** the Free Software Foundation; version 3.
42
11
** accordance with the commercial license agreement provided with the
11
**
43
12
** Software or, alternatively, in accordance with the terms contained in
12
** This program is distributed in the hope that it will be useful,
44
13
** a written agreement between you and Digia.  For licensing terms and
13
** but WITHOUT ANY WARRANTY; without even the implied warranty of
45
14
** conditions see http://qt.digia.com/licensing.  For further information
14
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
46
15
** use the contact form at http://qt.digia.com/contact-us.
15
** GNU General Public License for more details.
47
16
**
16
**
48
17
** GNU Lesser General Public License Usage
17
** You should have received a copy of the GNU General Public License
49
18
** Alternatively, this file may be used under the terms of the GNU Lesser
18
** along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
19
** General Public License version 2.1 as published by the Free Software
20
20
** Foundation and appearing in the file LICENSE.LGPL included in the
21
21
** packaging of this file.  Please review the following information to
22
22
** ensure the GNU Lesser General Public License version 2.1 requirements
23
23
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24
24
**
25
25
** In addition, as a special exception, Digia gives you certain additional
26
26
** rights.  These rights are described in the Digia Qt LGPL Exception
27
27
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
28
28
**
29
29
** GNU General Public License Usage
30
30
** Alternatively, this file may be used under the terms of the GNU
31
31
** General Public License version 3.0 as published by the Free Software
32
32
** Foundation and appearing in the file LICENSE.GPL included in the
33
33
** packaging of this file.  Please review the following information to
34
34
** ensure the GNU General Public License version 3.0 requirements will be
35
35
** met: http://www.gnu.org/copyleft/gpl.html.
36
36
**
37
37
**
38
38
** $QT_END_LICENSE$
50
39
**
19
**
51
40
****************************************************************************/
20
****************************************************************************/
52
41
21
53
42
22
54
=== modified file 'CameraApp/qstorageinfo.h'
55
--- CameraApp/qstorageinfo.h	2015-01-22 16:15:08 +0000
56
+++ CameraApp/qstorageinfo.h	2015-01-27 14:34:46 +0000
57
@@ -5,37 +5,17 @@
58
5
**
5
**
59
6
** This file is part of the QtCore module of the Qt Toolkit.
6
** This file is part of the QtCore module of the Qt Toolkit.
60
7
**
7
**
92
8
** $QT_BEGIN_LICENSE:LGPL$
8
** This program is free software; you can redistribute it and/or modify
93
9
** Commercial License Usage
9
** it under the terms of the GNU General Public License as published by
94
10
** Licensees holding valid commercial Qt licenses may use this file in
10
** the Free Software Foundation; version 3.
95
11
** accordance with the commercial license agreement provided with the
11
**
96
12
** Software or, alternatively, in accordance with the terms contained in
12
** This program is distributed in the hope that it will be useful,
97
13
** a written agreement between you and Digia.  For licensing terms and
13
** but WITHOUT ANY WARRANTY; without even the implied warranty of
98
14
** conditions see http://qt.digia.com/licensing.  For further information
14
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
99
15
** use the contact form at http://qt.digia.com/contact-us.
15
** GNU General Public License for more details.
100
16
**
16
**
101
17
** GNU Lesser General Public License Usage
17
** You should have received a copy of the GNU General Public License
102
18
** Alternatively, this file may be used under the terms of the GNU Lesser
18
** along with this program.  If not, see <http://www.gnu.org/licenses/>.
72
19
** General Public License version 2.1 as published by the Free Software
73
20
** Foundation and appearing in the file LICENSE.LGPL included in the
74
21
** packaging of this file.  Please review the following information to
75
22
** ensure the GNU Lesser General Public License version 2.1 requirements
76
23
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
77
24
**
78
25
** In addition, as a special exception, Digia gives you certain additional
79
26
** rights.  These rights are described in the Digia Qt LGPL Exception
80
27
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
81
28
**
82
29
** GNU General Public License Usage
83
30
** Alternatively, this file may be used under the terms of the GNU
84
31
** General Public License version 3.0 as published by the Free Software
85
32
** Foundation and appearing in the file LICENSE.GPL included in the
86
33
** packaging of this file.  Please review the following information to
87
34
** ensure the GNU General Public License version 3.0 requirements will be
88
35
** met: http://www.gnu.org/copyleft/gpl.html.
89
36
**
90
37
**
91
38
** $QT_END_LICENSE$
103
39
**
19
**
104
40
****************************************************************************/
20
****************************************************************************/
105
41
21
106
42
22
107
=== modified file 'CameraApp/qstorageinfo_p.h'
108
--- CameraApp/qstorageinfo_p.h	2015-01-22 16:15:08 +0000
109
+++ CameraApp/qstorageinfo_p.h	2015-01-27 14:34:46 +0000
110
@@ -3,39 +3,20 @@
111
3
** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com>
3
** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com>
112
4
** Contact: http://www.qt-project.org/legal
4
** Contact: http://www.qt-project.org/legal
113
5
**
5
**
114
6
**
115
6
** This file is part of the QtCore module of the Qt Toolkit.
7
** This file is part of the QtCore module of the Qt Toolkit.
116
7
**
8
**
148
8
** $QT_BEGIN_LICENSE:LGPL$
9
** This program is free software; you can redistribute it and/or modify
149
9
** Commercial License Usage
10
** it under the terms of the GNU General Public License as published by
150
10
** Licensees holding valid commercial Qt licenses may use this file in
11
** the Free Software Foundation; version 3.
151
11
** accordance with the commercial license agreement provided with the
12
**
152
12
** Software or, alternatively, in accordance with the terms contained in
13
** This program is distributed in the hope that it will be useful,
153
13
** a written agreement between you and Digia.  For licensing terms and
14
** but WITHOUT ANY WARRANTY; without even the implied warranty of
154
14
** conditions see http://qt.digia.com/licensing.  For further information
15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
155
15
** use the contact form at http://qt.digia.com/contact-us.
16
** GNU General Public License for more details.
156
16
**
17
**
157
17
** GNU Lesser General Public License Usage
18
** You should have received a copy of the GNU General Public License
158
18
** Alternatively, this file may be used under the terms of the GNU Lesser
19
** along with this program.  If not, see <http://www.gnu.org/licenses/>.
128
19
** General Public License version 2.1 as published by the Free Software
129
20
** Foundation and appearing in the file LICENSE.LGPL included in the
130
21
** packaging of this file.  Please review the following information to
131
22
** ensure the GNU Lesser General Public License version 2.1 requirements
132
23
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
133
24
**
134
25
** In addition, as a special exception, Digia gives you certain additional
135
26
** rights.  These rights are described in the Digia Qt LGPL Exception
136
27
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
137
28
**
138
29
** GNU General Public License Usage
139
30
** Alternatively, this file may be used under the terms of the GNU
140
31
** General Public License version 3.0 as published by the Free Software
141
32
** Foundation and appearing in the file LICENSE.GPL included in the
142
33
** packaging of this file.  Please review the following information to
143
34
** ensure the GNU General Public License version 3.0 requirements will be
144
35
** met: http://www.gnu.org/copyleft/gpl.html.
145
36
**
146
37
**
147
38
** $QT_END_LICENSE$
159
39
**
20
**
160
40
****************************************************************************/
21
****************************************************************************/
161
41
22
162
42
23
163
=== modified file 'CameraApp/qstorageinfo_unix.cpp'
164
--- CameraApp/qstorageinfo_unix.cpp	2015-01-22 16:15:08 +0000
165
+++ CameraApp/qstorageinfo_unix.cpp	2015-01-27 14:34:46 +0000
166
@@ -5,37 +5,17 @@
167
5
**
5
**
168
6
** This file is part of the QtCore module of the Qt Toolkit.
6
** This file is part of the QtCore module of the Qt Toolkit.
169
7
**
7
**
201
8
** $QT_BEGIN_LICENSE:LGPL$
8
** This program is free software; you can redistribute it and/or modify
202
9
** Commercial License Usage
9
** it under the terms of the GNU General Public License as published by
203
10
** Licensees holding valid commercial Qt licenses may use this file in
10
** the Free Software Foundation; version 3.
204
11
** accordance with the commercial license agreement provided with the
11
**
205
12
** Software or, alternatively, in accordance with the terms contained in
12
** This program is distributed in the hope that it will be useful,
206
13
** a written agreement between you and Digia.  For licensing terms and
13
** but WITHOUT ANY WARRANTY; without even the implied warranty of
207
14
** conditions see http://qt.digia.com/licensing.  For further information
14
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
208
15
** use the contact form at http://qt.digia.com/contact-us.
15
** GNU General Public License for more details.
209
16
**
16
**
210
17
** GNU Lesser General Public License Usage
17
** You should have received a copy of the GNU General Public License
211
18
** Alternatively, this file may be used under the terms of the GNU Lesser
18
** along with this program.  If not, see <http://www.gnu.org/licenses/>.
181
19
** General Public License version 2.1 as published by the Free Software
182
20
** Foundation and appearing in the file LICENSE.LGPL included in the
183
21
** packaging of this file.  Please review the following information to
184
22
** ensure the GNU Lesser General Public License version 2.1 requirements
185
23
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
186
24
**
187
25
** In addition, as a special exception, Digia gives you certain additional
188
26
** rights.  These rights are described in the Digia Qt LGPL Exception
189
27
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
190
28
**
191
29
** GNU General Public License Usage
192
30
** Alternatively, this file may be used under the terms of the GNU
193
31
** General Public License version 3.0 as published by the Free Software
194
32
** Foundation and appearing in the file LICENSE.GPL included in the
195
33
** packaging of this file.  Please review the following information to
196
34
** ensure the GNU General Public License version 3.0 requirements will be
197
35
** met: http://www.gnu.org/copyleft/gpl.html.
198
36
**
199
37
**
200
38
** $QT_END_LICENSE$
212
39
**
19
**
213
40
****************************************************************************/
20
****************************************************************************/
214
41
21
215
42
22
216
=== modified file 'camera-apparmor.json'
217
--- camera-apparmor.json	2014-12-02 12:59:18 +0000
218
+++ camera-apparmor.json	2015-01-27 14:34:46 +0000
219
@@ -10,5 +10,9 @@
220
10
        "content_exchange_source",
10
        "content_exchange_source",
221
11
        "location"
11
        "location"
222
12
    ],
12
    ],
224
13
    "policy_version": 1.2
13
    "policy_version": 1.2,
225
14
    "read_path": [
226
15
        "@{PROC}/*/mounts",
227
16
        "/dev/disk/by-label/"
228
17
    ]
229
14
}
18
}
Status:	Merged
Approved by:	Bill Filler on 2015-01-26
Approved revision:	494
Merged at revision:	483
Proposed branch:	lp:~phablet-team/camera-app/disk-space-monitor
Merge into:	lp:camera-app
Diff against target:	229 lines (+50/-125) 5 files modified CameraApp/qstorageinfo.cpp (+11/-31) CameraApp/qstorageinfo.h (+11/-31) CameraApp/qstorageinfo_p.h (+12/-31) CameraApp/qstorageinfo_unix.cpp (+11/-31) camera-apparmor.json (+5/-1)
To merge this branch:	bzr merge lp:~phablet-team/camera-app/disk-space-monitor
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-01-26
Ubuntu Phablet Team		2015-01-25	Pending
Review via email: mp+247528@code.launchpad.net