Ubuntu UI Toolkit

Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/qdocpaths into lp:ubuntu-ui-toolkit

  1. qdocpaths
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 306
Merged at revision: 307
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/qdocpaths
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 19 lines (+2/-2)
2 files modified
documentation/documentation.pri (+1/-1)
documentation/generate_html.sh (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/qdocpaths
Reviewer Review Type Date Requested Status
Juhapekka Piiroinen (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+146111@code.launchpad.net

Commit message

Update qdoc paths. A deep path until qtchooser handles qdoc.

Description of the change

Update qdoc paths. A deep path until qtchooser handles qdoc.

To post a comment you must log in.
Revision history for this message
Juhapekka Piiroinen (juhapekka-piiroinen) wrote :

Tested and works! Approve.

review: Approve
Revision history for this message
Martin Mrazik (mrazik) wrote :

I don't understand what happened but this is already merged (looks like some launchpad hiccup) as revision 307. Changing the global state accordingly.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'documentation/documentation.pri'
2--- documentation/documentation.pri 2013-01-30 18:16:26 +0000
3+++ documentation/documentation.pri 2013-02-01 13:26:29 +0000
4@@ -1,4 +1,4 @@
5-QDOC = /usr/bin/qdoc
6+QDOC = /usr/lib/*/qt5/bin/qdoc
7 system($$QDOC $$PWD/ubuntu-sdk.qdocconf)
8
9 install_docs.files = $$PWD/html
10
11=== modified file 'documentation/generate_html.sh'
12--- documentation/generate_html.sh 2013-01-30 18:16:26 +0000
13+++ documentation/generate_html.sh 2013-02-01 13:26:29 +0000
14@@ -15,4 +15,4 @@
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
17
18-qdoc ubuntu-sdk.qdocconf
19+/usr/lib/*/qt5/bin/qdoc ubuntu-sdk.qdocconf

Subscribers

People subscribed via source and target branches

to status/vote changes: