Merge lp:~xnox/unity-action-api/fix-cross into lp:unity-action-api

[Dimitri John Ledkov]

Fix cross-compilation, by using correct qdoc at compile time.

Fix cross-compilation, by using correct qdoc at compile time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/45/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yes!

review: Approve

=== modified file 'documentation/qml/CMakeLists.txt'
--- documentation/qml/CMakeLists.txt	2013-07-11 23:17:56 +0000
+++ documentation/qml/CMakeLists.txt	2013-12-12 23:34:20 +0000
@@ -1,5 +1,9 @@
 # add a target to generate API documentation with qdoc
-FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
+if(DEFINED ENV{DEB_BUILD_MULTIARCH})
+  set(QDOC_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdoc")
+else()
+  FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
+endif()
 if(QDOC_EXECUTABLE)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unity-action-qml.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-action-qml.qdocconf @ONLY)
 add_custom_target(qmldoc