Merge lp:~online-accounts/libaccounts-qt/packaging into lp:libaccounts-qt
- packaging
- Merge into trunk
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Approved by: | Alberto Mardegan |
Approved revision: | 151 |
Merged at revision: | 149 |
Proposed branch: | lp:~online-accounts/libaccounts-qt/packaging |
Merge into: | lp:libaccounts-qt |
Diff against target: |
574 lines (+163/-49) 27 files modified
.gitlab-ci.yml (+32/-0) Accounts/account-service.cpp (+2/-2) Accounts/account-service.h (+1/-1) Accounts/account.cpp (+1/-1) Accounts/account.h (+1/-1) Accounts/accountscommon.h (+2/-1) Accounts/application.cpp (+17/-1) Accounts/application.h (+23/-20) Accounts/auth-data.cpp (+1/-1) Accounts/auth-data.h (+1/-1) Accounts/error.cpp (+2/-1) Accounts/error.h (+2/-1) Accounts/manager.cpp (+30/-1) Accounts/manager.h (+2/-1) Accounts/manager_p.h (+1/-1) Accounts/provider.cpp (+1/-1) Accounts/provider.h (+1/-1) Accounts/service-type.cpp (+1/-1) Accounts/service-type.h (+1/-1) Accounts/service.cpp (+1/-1) Accounts/service.h (+1/-1) Accounts/utils.cpp (+1/-1) Accounts/utils.h (+1/-1) common-vars.pri (+2/-2) debian/changelog (+12/-0) debian/control (+1/-4) tests/tst_libaccounts.cpp (+22/-1) |
To merge this branch: | bzr merge lp:~online-accounts/libaccounts-qt/packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Online Accounts | Pending | ||
Review via email: mp+307139@code.launchpad.net |
Commit message
Description of the change
Merge from upstream
Add Manager:
To post a comment you must log in.
- 151. By Alberto Mardegan
-
Remove dependency on Qt4 packages
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.gitlab-ci.yml' |
2 | --- .gitlab-ci.yml 1970-01-01 00:00:00 +0000 |
3 | +++ .gitlab-ci.yml 2016-09-29 09:02:36 +0000 |
4 | @@ -0,0 +1,32 @@ |
5 | +image: ubuntu:xenial |
6 | + |
7 | +cache: |
8 | + key: apt-cache |
9 | + paths: |
10 | + - apt-cache/ |
11 | + |
12 | +before_script: |
13 | + - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR |
14 | + - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qtbase5-dev qtchooser pkg-config doxygen libaccounts-glib-dev |
15 | + - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr |
16 | + |
17 | +build_amd64: |
18 | + stage: build |
19 | + script: |
20 | + - export QT_SELECT=qt5 |
21 | + - mkdir build |
22 | + - cd build |
23 | + - qmake CONFIG+=debug CONFIG+=coverage .. |
24 | + - make -j 4 |
25 | + artifacts: |
26 | + paths: |
27 | + - build/ |
28 | + |
29 | +test_amd64: |
30 | + stage: test |
31 | + script: |
32 | + - find build | xargs touch # Avoid rebuilding |
33 | + - cd build |
34 | + - make coverage-html |
35 | + dependencies: |
36 | + - build_amd64 |
37 | |
38 | === modified file 'Accounts/account-service.cpp' |
39 | --- Accounts/account-service.cpp 2015-10-27 12:31:06 +0000 |
40 | +++ Accounts/account-service.cpp 2016-09-29 09:02:36 +0000 |
41 | @@ -3,9 +3,9 @@ |
42 | * This file is part of libaccounts-qt |
43 | * |
44 | * Copyright (C) 2009-2010 Nokia Corporation. |
45 | - * Copyright (C) 2013 Canonical Ltd. |
46 | + * Copyright (C) 2013-2016 Canonical Ltd. |
47 | * |
48 | - * Contact: Alberto Mardegan <alberto.mardegan@nokia.com> |
49 | + * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
50 | * |
51 | * This library is free software; you can redistribute it and/or |
52 | * modify it under the terms of the GNU Lesser General Public License |
53 | |
54 | === modified file 'Accounts/account-service.h' |
55 | --- Accounts/account-service.h 2013-06-17 10:19:48 +0000 |
56 | +++ Accounts/account-service.h 2016-09-29 09:02:36 +0000 |
57 | @@ -2,7 +2,7 @@ |
58 | /* |
59 | * This file is part of libaccounts-qt |
60 | * |
61 | -* Copyright (C) 2012 Canonical Ltd. |
62 | +* Copyright (C) 2012-2016 Canonical Ltd. |
63 | * |
64 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
65 | * |
66 | |
67 | === modified file 'Accounts/account.cpp' |
68 | --- Accounts/account.cpp 2015-10-27 12:31:06 +0000 |
69 | +++ Accounts/account.cpp 2016-09-29 09:02:36 +0000 |
70 | @@ -3,7 +3,7 @@ |
71 | * This file is part of libaccounts-qt |
72 | * |
73 | * Copyright (C) 2009-2011 Nokia Corporation. |
74 | - * Copyright (C) 2012-2013 Canonical Ltd. |
75 | + * Copyright (C) 2012-2016 Canonical Ltd. |
76 | * |
77 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
78 | * |
79 | |
80 | === modified file 'Accounts/account.h' |
81 | --- Accounts/account.h 2015-09-30 08:17:50 +0000 |
82 | +++ Accounts/account.h 2016-09-29 09:02:36 +0000 |
83 | @@ -3,7 +3,7 @@ |
84 | * This file is part of libaccounts-qt |
85 | * |
86 | * Copyright (C) 2009-2011 Nokia Corporation. |
87 | - * Copyright (C) 2012 Canonical Ltd. |
88 | + * Copyright (C) 2012-2016 Canonical Ltd. |
89 | * |
90 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
91 | * |
92 | |
93 | === modified file 'Accounts/accountscommon.h' |
94 | --- Accounts/accountscommon.h 2015-10-27 12:31:06 +0000 |
95 | +++ Accounts/accountscommon.h 2016-09-29 09:02:36 +0000 |
96 | @@ -3,8 +3,9 @@ |
97 | * This file is part of libaccounts-qt |
98 | * |
99 | * Copyright (C) 2009-2011 Nokia Corporation. |
100 | + * Copyright (C) 2012-2016 Canonical Ltd. |
101 | * |
102 | - * Contact: Alberto Mardegan <alberto.mardegan@nokia.com> |
103 | + * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
104 | * |
105 | * This library is free software; you can redistribute it and/or |
106 | * modify it under the terms of the GNU Lesser General Public License |
107 | |
108 | === modified file 'Accounts/application.cpp' |
109 | --- Accounts/application.cpp 2014-02-11 10:33:32 +0000 |
110 | +++ Accounts/application.cpp 2016-09-29 09:02:36 +0000 |
111 | @@ -2,7 +2,7 @@ |
112 | /* |
113 | * This file is part of libaccounts-qt |
114 | * |
115 | - * Copyright (C) 2012 Canonical Ltd. |
116 | + * Copyright (C) 2012-2016 Canonical Ltd. |
117 | * |
118 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
119 | * |
120 | @@ -180,6 +180,17 @@ |
121 | } |
122 | |
123 | /*! |
124 | + * Check whether the application supports the given service. |
125 | + * @param service Instance of a Service. |
126 | + * @return whether the service is supported by this application. |
127 | + */ |
128 | +bool Application::supportsService(const Service &service) const |
129 | +{ |
130 | + return ag_application_supports_service(m_application, |
131 | + service.service()); |
132 | +} |
133 | + |
134 | +/*! |
135 | * Get the description from the application XML file, for the specified |
136 | * service; if not found, get the service-type description instead. |
137 | * @return Usage description of the service. |
138 | @@ -189,3 +200,8 @@ |
139 | return UTF8(ag_application_get_service_usage(m_application, |
140 | service.service())); |
141 | } |
142 | + |
143 | +AgApplication *Application::application() const |
144 | +{ |
145 | + return m_application; |
146 | +} |
147 | |
148 | === modified file 'Accounts/application.h' |
149 | --- Accounts/application.h 2014-02-11 10:33:32 +0000 |
150 | +++ Accounts/application.h 2016-09-29 09:02:36 +0000 |
151 | @@ -1,25 +1,26 @@ |
152 | /* vi: set et sw=4 ts=4 cino=t0,(0: */ |
153 | /* |
154 | -* This file is part of libaccounts-qt |
155 | -* |
156 | -* Copyright (C) 2012 Nokia Corporation. |
157 | -* |
158 | -* Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
159 | -* |
160 | -* This library is free software; you can redistribute it and/or |
161 | -* modify it under the terms of the GNU Lesser General Public License |
162 | -* version 2.1 as published by the Free Software Foundation. |
163 | -* |
164 | -* This library is distributed in the hope that it will be useful, but |
165 | -* WITHOUT ANY WARRANTY; without even the implied warranty of |
166 | -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
167 | -* Lesser General Public License for more details. |
168 | -* |
169 | -* You should have received a copy of the GNU Lesser General Public |
170 | -* License along with this library; if not, write to the Free Software |
171 | -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA |
172 | -* 02110-1301 USA |
173 | -*/ |
174 | + * This file is part of libaccounts-qt |
175 | + * |
176 | + * Copyright (C) 2012 Nokia Corporation. |
177 | + * Copyright (C) 2012-2016 Canonical Ltd. |
178 | + * |
179 | + * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
180 | + * |
181 | + * This library is free software; you can redistribute it and/or |
182 | + * modify it under the terms of the GNU Lesser General Public License |
183 | + * version 2.1 as published by the Free Software Foundation. |
184 | + * |
185 | + * This library is distributed in the hope that it will be useful, but |
186 | + * WITHOUT ANY WARRANTY; without even the implied warranty of |
187 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
188 | + * Lesser General Public License for more details. |
189 | + * |
190 | + * You should have received a copy of the GNU Lesser General Public |
191 | + * License along with this library; if not, write to the Free Software |
192 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA |
193 | + * 02110-1301 USA |
194 | + */ |
195 | |
196 | #ifndef ACCOUNTS_APPLICATION_H |
197 | #define ACCOUNTS_APPLICATION_H |
198 | @@ -54,12 +55,14 @@ |
199 | QString desktopFilePath() const; |
200 | QString trCatalog() const; |
201 | |
202 | + bool supportsService(const Service &service) const; |
203 | QString serviceUsage(const Service &service) const; |
204 | |
205 | private: |
206 | // Don't include private data in docs: \cond |
207 | friend class Manager; |
208 | Application(AgApplication *application); |
209 | + AgApplication *application() const; |
210 | |
211 | AgApplication *m_application; |
212 | // \endcond |
213 | |
214 | === modified file 'Accounts/auth-data.cpp' |
215 | --- Accounts/auth-data.cpp 2014-09-05 13:23:44 +0000 |
216 | +++ Accounts/auth-data.cpp 2016-09-29 09:02:36 +0000 |
217 | @@ -2,7 +2,7 @@ |
218 | /* |
219 | * This file is part of libaccounts-qt |
220 | * |
221 | - * Copyright (C) 2012 Canonical Ltd. |
222 | + * Copyright (C) 2012-2016 Canonical Ltd. |
223 | * |
224 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
225 | * |
226 | |
227 | === modified file 'Accounts/auth-data.h' |
228 | --- Accounts/auth-data.h 2012-03-13 10:54:48 +0000 |
229 | +++ Accounts/auth-data.h 2016-09-29 09:02:36 +0000 |
230 | @@ -2,7 +2,7 @@ |
231 | /* |
232 | * This file is part of libaccounts-qt |
233 | * |
234 | - * Copyright (C) 2012 Canonical Ltd. |
235 | + * Copyright (C) 2012-2016 Canonical Ltd. |
236 | * |
237 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
238 | * |
239 | |
240 | === modified file 'Accounts/error.cpp' |
241 | --- Accounts/error.cpp 2012-03-13 09:50:49 +0000 |
242 | +++ Accounts/error.cpp 2016-09-29 09:02:36 +0000 |
243 | @@ -2,8 +2,9 @@ |
244 | * This file is part of libaccounts-qt |
245 | * |
246 | * Copyright (C) 2011 Nokia Corporation. |
247 | + * Copyright (C) 2012-2016 Canonical Ltd. |
248 | * |
249 | - * Contact: Alberto Mardegan <alberto.mardegan@nokia.com> |
250 | + * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
251 | * |
252 | * This library is free software; you can redistribute it and/or |
253 | * modify it under the terms of the GNU Lesser General Public License |
254 | |
255 | === modified file 'Accounts/error.h' |
256 | --- Accounts/error.h 2013-01-21 09:43:43 +0000 |
257 | +++ Accounts/error.h 2016-09-29 09:02:36 +0000 |
258 | @@ -2,8 +2,9 @@ |
259 | * This file is part of libaccounts-qt |
260 | * |
261 | * Copyright (C) 2011 Nokia Corporation. |
262 | + * Copyright (C) 2012-2016 Canonical Ltd. |
263 | * |
264 | - * Contact: Alberto Mardegan <alberto.mardegan@nokia.com> |
265 | + * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
266 | * |
267 | * This library is free software; you can redistribute it and/or |
268 | * modify it under the terms of the GNU Lesser General Public License |
269 | |
270 | === modified file 'Accounts/manager.cpp' |
271 | --- Accounts/manager.cpp 2015-08-14 07:18:58 +0000 |
272 | +++ Accounts/manager.cpp 2016-09-29 09:02:36 +0000 |
273 | @@ -3,7 +3,7 @@ |
274 | * This file is part of libaccounts-qt |
275 | * |
276 | * Copyright (C) 2009-2011 Nokia Corporation. |
277 | - * Copyright (C) 2012-2013 Canonical Ltd. |
278 | + * Copyright (C) 2012-2016 Canonical Ltd. |
279 | * |
280 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
281 | * |
282 | @@ -384,6 +384,35 @@ |
283 | } |
284 | |
285 | /*! |
286 | + * Get the list of services supported by the given application. |
287 | + * |
288 | + * @param application Application whose services are to be retrieved. |
289 | + * |
290 | + * @return List of Service objects. |
291 | + */ |
292 | +ServiceList Manager::serviceList(const Application &application) const |
293 | +{ |
294 | + GList *list; |
295 | + |
296 | + list = ag_manager_list_services_by_application(d->m_manager, |
297 | + application.application()); |
298 | + |
299 | + /* convert glist -> ServiceList */ |
300 | + ServiceList servList; |
301 | + GList *iter; |
302 | + |
303 | + for (iter = list; iter; iter = g_list_next(iter)) |
304 | + { |
305 | + AgService *service = (AgService*)iter->data; |
306 | + servList.append(Service(service, StealReference)); |
307 | + } |
308 | + |
309 | + g_list_free(list); |
310 | + |
311 | + return servList; |
312 | +} |
313 | + |
314 | +/*! |
315 | * Gets an object representing a provider. |
316 | * @param providerName Name of provider to get. |
317 | * |
318 | |
319 | === modified file 'Accounts/manager.h' |
320 | --- Accounts/manager.h 2014-08-14 14:50:11 +0000 |
321 | +++ Accounts/manager.h 2016-09-29 09:02:36 +0000 |
322 | @@ -3,7 +3,7 @@ |
323 | * This file is part of libaccounts-qt |
324 | * |
325 | * Copyright (C) 2009-2011 Nokia Corporation. |
326 | - * Copyright (C) 2012 Canonical Ltd. |
327 | + * Copyright (C) 2012-2016 Canonical Ltd. |
328 | * |
329 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
330 | * |
331 | @@ -76,6 +76,7 @@ |
332 | |
333 | Service service(const QString &serviceName) const; |
334 | ServiceList serviceList(const QString &serviceType = QString::null) const; |
335 | + ServiceList serviceList(const Application &application) const; |
336 | |
337 | Provider provider(const QString &providerName) const; |
338 | ProviderList providerList() const; |
339 | |
340 | === modified file 'Accounts/manager_p.h' |
341 | --- Accounts/manager_p.h 2013-04-26 06:31:51 +0000 |
342 | +++ Accounts/manager_p.h 2016-09-29 09:02:36 +0000 |
343 | @@ -3,7 +3,7 @@ |
344 | * This file is part of libaccounts-qt |
345 | * |
346 | * Copyright (C) 2009-2011 Nokia Corporation. |
347 | - * Copyright (C) 2012-2013 Canonical Ltd. |
348 | + * Copyright (C) 2012-2016 Canonical Ltd. |
349 | * |
350 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
351 | * |
352 | |
353 | === modified file 'Accounts/provider.cpp' |
354 | --- Accounts/provider.cpp 2015-09-30 08:17:50 +0000 |
355 | +++ Accounts/provider.cpp 2016-09-29 09:02:36 +0000 |
356 | @@ -3,7 +3,7 @@ |
357 | * This file is part of libaccounts-qt |
358 | * |
359 | * Copyright (C) 2009-2011 Nokia Corporation. |
360 | - * Copyright (C) 2012-2014 Canonical Ltd. |
361 | + * Copyright (C) 2012-2016 Canonical Ltd. |
362 | * |
363 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
364 | * |
365 | |
366 | === modified file 'Accounts/provider.h' |
367 | --- Accounts/provider.h 2014-03-05 15:56:31 +0000 |
368 | +++ Accounts/provider.h 2016-09-29 09:02:36 +0000 |
369 | @@ -3,7 +3,7 @@ |
370 | * This file is part of libaccounts-qt |
371 | * |
372 | * Copyright (C) 2009-2011 Nokia Corporation. |
373 | - * Copyright (C) 2012-2014 Canonical Ltd. |
374 | + * Copyright (C) 2012-2016 Canonical Ltd. |
375 | * |
376 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
377 | * |
378 | |
379 | === modified file 'Accounts/service-type.cpp' |
380 | --- Accounts/service-type.cpp 2015-09-30 08:17:50 +0000 |
381 | +++ Accounts/service-type.cpp 2016-09-29 09:02:36 +0000 |
382 | @@ -3,7 +3,7 @@ |
383 | * This file is part of libaccounts-qt |
384 | * |
385 | * Copyright (C) 2009-2011 Nokia Corporation. |
386 | - * Copyright (C) 2012 Canonical Ltd. |
387 | + * Copyright (C) 2012-2016 Canonical Ltd. |
388 | * Copyright (C) 2012 Intel Corporation. |
389 | * |
390 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
391 | |
392 | === modified file 'Accounts/service-type.h' |
393 | --- Accounts/service-type.h 2012-05-21 12:35:18 +0000 |
394 | +++ Accounts/service-type.h 2016-09-29 09:02:36 +0000 |
395 | @@ -3,7 +3,7 @@ |
396 | * This file is part of libaccounts-qt |
397 | * |
398 | * Copyright (C) 2011 Nokia Corporation. |
399 | - * Copyright (C) 2012 Canonical Ltd. |
400 | + * Copyright (C) 2012-2016 Canonical Ltd. |
401 | * Copyright (C) 2012 Intel Corporation. |
402 | * |
403 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
404 | |
405 | === modified file 'Accounts/service.cpp' |
406 | --- Accounts/service.cpp 2015-09-30 08:17:50 +0000 |
407 | +++ Accounts/service.cpp 2016-09-29 09:02:36 +0000 |
408 | @@ -3,7 +3,7 @@ |
409 | * This file is part of libaccounts-qt |
410 | * |
411 | * Copyright (C) 2009-2011 Nokia Corporation. |
412 | - * Copyright (C) 2012 Canonical Ltd. |
413 | + * Copyright (C) 2012-2016 Canonical Ltd. |
414 | * Copyright (C) 2012 Intel Corporation. |
415 | * |
416 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
417 | |
418 | === modified file 'Accounts/service.h' |
419 | --- Accounts/service.h 2012-05-21 12:35:18 +0000 |
420 | +++ Accounts/service.h 2016-09-29 09:02:36 +0000 |
421 | @@ -3,7 +3,7 @@ |
422 | * This file is part of libaccounts-qt |
423 | * |
424 | * Copyright (C) 2009-2011 Nokia Corporation. |
425 | - * Copyright (C) 2012 Canonical Ltd. |
426 | + * Copyright (C) 2012-2016 Canonical Ltd. |
427 | * Copyright (C) 2012 Intel Corporation. |
428 | * |
429 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
430 | |
431 | === modified file 'Accounts/utils.cpp' |
432 | --- Accounts/utils.cpp 2015-09-30 08:17:50 +0000 |
433 | +++ Accounts/utils.cpp 2016-09-29 09:02:36 +0000 |
434 | @@ -2,7 +2,7 @@ |
435 | /* |
436 | * This file is part of libaccounts-qt |
437 | * |
438 | - * Copyright (C) 2012 Canonical Ltd. |
439 | + * Copyright (C) 2012-2016 Canonical Ltd. |
440 | * |
441 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
442 | * |
443 | |
444 | === modified file 'Accounts/utils.h' |
445 | --- Accounts/utils.h 2013-01-18 11:55:30 +0000 |
446 | +++ Accounts/utils.h 2016-09-29 09:02:36 +0000 |
447 | @@ -2,7 +2,7 @@ |
448 | /* |
449 | * This file is part of libaccounts-qt |
450 | * |
451 | - * Copyright (C) 2012 Canonical Ltd. |
452 | + * Copyright (C) 2012-2016 Canonical Ltd. |
453 | * |
454 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
455 | * |
456 | |
457 | === modified file 'common-vars.pri' |
458 | --- common-vars.pri 2015-09-30 08:58:04 +0000 |
459 | +++ common-vars.pri 2016-09-29 09:02:36 +0000 |
460 | @@ -13,12 +13,12 @@ |
461 | #----------------------------------------------------------------------------- |
462 | # Project version |
463 | #----------------------------------------------------------------------------- |
464 | -PROJECT_VERSION = 1.14 |
465 | +PROJECT_VERSION = 1.15 |
466 | |
467 | #----------------------------------------------------------------------------- |
468 | # Library version |
469 | #----------------------------------------------------------------------------- |
470 | -VERSION = 1.2 |
471 | +VERSION = 1.3 |
472 | |
473 | |
474 | # End of File |
475 | |
476 | === modified file 'debian/changelog' |
477 | --- debian/changelog 2015-11-06 13:54:55 +0000 |
478 | +++ debian/changelog 2016-09-29 09:02:36 +0000 |
479 | @@ -1,3 +1,15 @@ |
480 | +libaccounts-qt (1.15-0ubuntu1) UNRELEASED; urgency=medium |
481 | + |
482 | + * New upstream release |
483 | + - Lib: add Manager::listServices() by application |
484 | + and Application::supportsService() |
485 | + - Enable CI in gitlab |
486 | + - Build: fix out of tree builds |
487 | + * debian/control: |
488 | + - Remove dependency on Qt4 packages |
489 | + |
490 | + -- Alberto Mardegan <alberto.mardegan@canonical.com> Thu, 29 Sep 2016 11:53:39 +0300 |
491 | + |
492 | libaccounts-qt (1.14+16.04.20151106.1-0ubuntu1) xenial; urgency=medium |
493 | |
494 | [ Alberto Mardegan ] |
495 | |
496 | === modified file 'debian/control' |
497 | --- debian/control 2015-11-02 09:11:27 +0000 |
498 | +++ debian/control 2016-09-29 09:02:36 +0000 |
499 | @@ -5,13 +5,10 @@ |
500 | doxygen, |
501 | pkg-config, |
502 | libglib2.0-dev, |
503 | - libqt4-dev, |
504 | - qt4-dev-tools, |
505 | qtchooser, |
506 | - qt4-qmake, |
507 | qt5-qmake, |
508 | qtbase5-dev, |
509 | - libaccounts-glib-dev (>= 1.17), |
510 | + libaccounts-glib-dev (>= 1.23), |
511 | dbus-test-runner, |
512 | Standards-Version: 3.9.3 |
513 | Section: libs |
514 | |
515 | === modified file 'tests/tst_libaccounts.cpp' |
516 | --- tests/tst_libaccounts.cpp 2015-10-01 14:53:36 +0000 |
517 | +++ tests/tst_libaccounts.cpp 2016-09-29 09:02:36 +0000 |
518 | @@ -3,7 +3,7 @@ |
519 | * This file is part of libaccounts-qt |
520 | * |
521 | * Copyright (C) 2009-2011 Nokia Corporation. |
522 | - * Copyright (C) 2015 Canonical Ltd. |
523 | + * Copyright (C) 2015-2016 Canonical Ltd. |
524 | * |
525 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
526 | * |
527 | @@ -99,6 +99,7 @@ |
528 | void testServiceType(); |
529 | void testUpdateAccount(); |
530 | void testApplication(); |
531 | + void testApplicationListServices(); |
532 | |
533 | public Q_SLOTS: |
534 | void onAccountServiceChanged(); |
535 | @@ -1418,6 +1419,7 @@ |
536 | QCOMPARE(application.iconName(), UTF8("mailer-icon")); |
537 | QCOMPARE(application.desktopFilePath(), |
538 | UTF8(qgetenv("AG_APPLICATIONS") + "/applications/mailer.desktop")); |
539 | + QVERIFY(application.supportsService(email)); |
540 | QCOMPARE(application.serviceUsage(email), |
541 | UTF8("Mailer can retrieve your e-mails")); |
542 | |
543 | @@ -1430,6 +1432,7 @@ |
544 | application = apps[0]; |
545 | QCOMPARE(application.name(), UTF8("Gallery")); |
546 | QCOMPARE(application.description(), UTF8("Image gallery")); |
547 | + QVERIFY(application.supportsService(sharing)); |
548 | QCOMPARE(application.serviceUsage(sharing), |
549 | UTF8("Publish images on OtherService")); |
550 | |
551 | @@ -1442,5 +1445,23 @@ |
552 | delete manager; |
553 | } |
554 | |
555 | +void AccountsTest::testApplicationListServices() |
556 | +{ |
557 | + Manager *manager = new Manager(); |
558 | + QVERIFY(manager != 0); |
559 | + |
560 | + Application application = manager->application("Mailer"); |
561 | + QVERIFY(application.isValid()); |
562 | + |
563 | + ServiceList services = manager->serviceList(application); |
564 | + |
565 | + QCOMPARE(services.count(), 1); |
566 | + Service service = services.first(); |
567 | + |
568 | + QCOMPARE(service.name(), QString("MyService")); |
569 | + |
570 | + delete manager; |
571 | +} |
572 | + |
573 | QTEST_GUILESS_MAIN(AccountsTest) |
574 | #include "tst_libaccounts.moc" |