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

[Timo Jyrinki]

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

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

[Juhapekka Piiroinen (juhapekka-piiroinen)]

Tested and works! Approve.

review: Approve

[Martin Mrazik (mrazik)]

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

=== modified file 'documentation/documentation.pri'
--- documentation/documentation.pri	2013-01-30 18:16:26 +0000
+++ documentation/documentation.pri	2013-02-01 13:26:29 +0000
@@ -1,4 +1,4 @@
-QDOC = /usr/bin/qdoc
+QDOC = /usr/lib/*/qt5/bin/qdoc
 system($$QDOC $$PWD/ubuntu-sdk.qdocconf)
 
 install_docs.files = $$PWD/html
 
=== modified file 'documentation/generate_html.sh'
--- documentation/generate_html.sh	2013-01-30 18:16:26 +0000
+++ documentation/generate_html.sh	2013-02-01 13:26:29 +0000
@@ -15,4 +15,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-qdoc ubuntu-sdk.qdocconf
+/usr/lib/*/qt5/bin/qdoc ubuntu-sdk.qdocconf