Merge lp://qastaging/~muktupavels/indicator-sound/indicator-sound into lp://qastaging/indicator-sound
| Status: | Approved |
|---|---|
| Approved by: | Dmitry Shachnev |
| Approved revision: | 570 |
| Proposed branch: | lp://qastaging/~muktupavels/indicator-sound/indicator-sound |
| Merge into: | lp://qastaging/indicator-sound |
| Diff against target: |
156 lines (+34/-27) 7 files modified
CMakeLists.txt (+1/-1) src/accounts-service-user.vala (+6/-2) src/media-player-list-mpris.vala (+3/-0) tests/dbus-types/CMakeLists.txt (+3/-3) tests/integration/CMakeLists.txt (+12/-12) tests/service-mocks/accounts-mock/CMakeLists.txt (+3/-3) tests/service-mocks/media-player-mpris-mock/CMakeLists.txt (+6/-6) |
| To merge this branch: | bzr merge lp://qastaging/~muktupavels/indicator-sound/indicator-sound |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
media-player-
| Alberts Muktupāvels (muktupavels) wrote | # |
| Dmitry Shachnev (mitya57) | # |
Unmerged revisions
- 570. By Alberts Muktupāvels
-
media-player-
list-mpris: fix critical indicator-
sound-CRITICAL:
media_player_list_mpris_ insert: assertion 'desktop_id != NULL' failed Warning can be reproduced watching YouTube video in Google Chrome.
- 569. By Alberts Muktupāvels
-
accounts-
service- user: fix warnings warning: Access to possible `null'. Perform a check or use an unsafe cast.
- 568. By Alberts Muktupāvels
-
cmake: bump minimum required version to 3.18.0
Fixes following warning:
CMake Deprecation Warning at CMakeLists.txt:2 (cmake_minimum_ required) :
Compatibility with CMake < 2.8.12 will be removed from a future version of
CMake. - 567. By Alberts Muktupāvels
-
tests: stop using qt5_use_modules
Fixes following warnings:
CMake Warning (dev) at /usr/lib/x86_64- linux-gnu/ cmake/Qt5Core/ Qt5CoreMacros. cmake:44 (message):
qt5_use_modules is not part of the official API, and might be removed in Qt 6.
Rebuild requires fix in vala - https:/