Merge lp:~timo-jyrinki/webbrowser-app/fix_qt56_qdoc_move into lp:webbrowser-app
Proposed by
Timo Jyrinki
on 2016-04-03
| Status: | Merged |
|---|---|
| Approved by: | Olivier Tilloy on 2016-04-04 |
| Approved revision: | 1393 |
| Merged at revision: | 1420 |
| Proposed branch: | lp:~timo-jyrinki/webbrowser-app/fix_qt56_qdoc_move |
| Merge into: | lp:webbrowser-app |
| Diff against target: |
11 lines (+1/-0) 1 file modified
debian/control (+1/-0) |
| To merge this branch: | bzr merge lp:~timo-jyrinki/webbrowser-app/fix_qt56_qdoc_move |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Olivier Tilloy | 2016-04-03 | Approve on 2016-04-04 | |
|
Review via email:
|
|||
Commit Message
Fix FTBFS on Qt 5.6 by adding a dependency on qttools5-dev-tools for qdoc
To post a comment you must log in.
| Olivier Tilloy (osomon) wrote : | # |
| Timo Jyrinki (timo-jyrinki) wrote : | # |
qtbase5-dev-tools is still available, so that would mean qttools5-dev-tools would never get installed.
The problem is that qdoc is in qttools5-dev-tools in 5.6 and in qtbase5-dev-tools in 5.5. One can't construct such a build dependency string in debian/control, so it's easier to just depend on qttools5-dev-tools unconditionally. Having that package installed with 5.5 too does no harm.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Shouldn’t this be:
qtbase5-dev-tools | qttools5-dev-tools,
As far as I can tell the explicit build dependency on qtbase5-dev-tools was added specifically for qdoc.