Merge lp:~michael-sheldon/content-hub/qdoc-fix into lp:content-hub

[Michael Sheldon]

Make qdoc based documentation compatible with the Qt 5.2 version of qdoc.

Makes qdoc based documentation compatible with the Qt 5.2 version of qdoc.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No changes

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/content-hub-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/136/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, it would be nice to switch back if qdoc gets fixed.

review: Approve

=== modified file 'doc/qml/ubuntu-content-hub.qdocconf.in'
--- doc/qml/ubuntu-content-hub.qdocconf.in	2013-10-21 17:30:55 +0000
+++ doc/qml/ubuntu-content-hub.qdocconf.in	2014-03-27 13:10:12 +0000
@@ -1,9 +1,8 @@
 project = Ubuntu Content QML API
 description = Ubuntu Content API
 
-sourcedirs = @CMAKE_CURRENT_SOURCE_DIR@/pages @CMAKE_SOURCE_DIR@/import
-exampledirs = @CMAKE_SOURCE_DIR@/examples/
-imagedirs = @CMAKE_CURRENT_SOURCE_DIR@/../images
+sourcedirs = ../../../doc/qml/pages ../../../import
+exampledirs = ../../../examples/
 
 sources.fileextensions = "*.qdoc *.qml *.cpp"
 headers.fileextensions = "*.h"
@@ -16,7 +15,7 @@
 outputprefixes = QML
 outputprefixes.QML = qml-
 
-HTML.templatedir = @CMAKE_CURRENT_SOURCE_DIR@/
+HTML.templatedir = ../../../doc/
 HTML.nobreadcrumbs = "true"
 		   
 HTML.stylesheets = \