Merge lp://qastaging/~timo-jyrinki/qtgrilo/fix_lp1287180 into lp://qastaging/qtgrilo
Proposed by
Timo Jyrinki
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Timo Jyrinki | ||||
| Approved revision: | 15 | ||||
| Merged at revision: | 15 | ||||
| Proposed branch: | lp://qastaging/~timo-jyrinki/qtgrilo/fix_lp1287180 | ||||
| Merge into: | lp://qastaging/qtgrilo | ||||
| Diff against target: |
89 lines (+27/-1) 6 files modified
debian/changelog (+19/-0) debian/control (+0/-1) declarative/grilodatasource.h (+2/-0) declarative/grilomedia.h (+2/-0) declarative/griloplugin.h (+2/-0) declarative/griloregistry.h (+2/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/qtgrilo/fix_lp1287180 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Victor Thompson | Approve | ||
|
Review via email:
|
|||
Commit message
Prevent 'signals' from GDBus from clashing with Qt's 'signals' (LP: #1287180)
Description of the change
Obviously a hack, and I'm not familiar with qtgrilo.
To post a comment you must log in.
Revision history for this message
| Timo Jyrinki (timo-jyrinki) wrote | # |
Revision history for this message
| Timo Jyrinki (timo-jyrinki) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Built for armhf + i386 + amd64 against Qt 5.2:
https:/