Merge lp:~fboucault/ubuntu-ui-extras/crossbuild_fixes into lp:ubuntu-ui-extras

[Florian Boucault]

Fixes for crossbuilding.

Fixes for crossbuilding.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:106
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-ui-extras-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/852/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/852
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/773
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/773
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/773
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/775/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/775/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/775/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/775/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/775/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/775/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/775/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/775/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/775
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/775/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-ui-extras-ci/6/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-12-21 13:56:33 +0000
+++ debian/control	2016-07-06 08:37:11 +0000
@@ -6,9 +6,8 @@
                debhelper (>= 9),
                gettext,
                pkg-config,
-               python,
+               python:any,
                qt5-default,
-               qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,

=== modified file 'modules/Ubuntu/Components/Extras/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/CMakeLists.txt	2014-12-09 11:14:16 +0000
+++ modules/Ubuntu/Components/Extras/CMakeLists.txt	2016-07-06 08:37:11 +0000
@@ -1,15 +1,6 @@
 file(GLOB QML_FILES *.qml qmldir)
 
-# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
-get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
-function(QUERY_QMAKE VAR RESULT)
-  exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
-  if(NOT return_code)
-    file(TO_CMAKE_PATH "${output}" output)
-    set(${RESULT} ${output} PARENT_SCOPE)
-  endif(NOT return_code)
-endfunction(QUERY_QMAKE)
-query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
 
 set(PLUGIN_DIR ${QT_IMPORTS_DIR}/Ubuntu/Components/Extras)
 install(FILES ${QML_FILES} DESTINATION ${PLUGIN_DIR})

=== modified file 'modules/Ubuntu/Components/Extras/plugin/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/plugin/CMakeLists.txt	2014-12-09 10:57:19 +0000
+++ modules/Ubuntu/Components/Extras/plugin/CMakeLists.txt	2016-07-06 08:37:11 +0000
@@ -30,16 +30,8 @@
     ${EXIV2_LIBRARIES}
     )
 
-# Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
-get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
-function(QUERY_QMAKE VAR RESULT)
-  exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
-  if(NOT return_code)
-    file(TO_CMAKE_PATH "${output}" output)
-    set(${RESULT} ${output} PARENT_SCOPE)
-  endif(NOT return_code)
-endfunction(QUERY_QMAKE)
-query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
+
+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
 
 set(PLUGIN_DIR ${QT_IMPORTS_DIR}/Ubuntu/Components/Extras)
 install(TARGETS ubuntu-ui-extras-plugin DESTINATION ${PLUGIN_DIR})