Merge lp:~fboucault/unity-webapps-qml/crossbuild_fixes into lp:unity-webapps-qml

[Florian Boucault]

Fixes for crossbuilding.

Fixes for crossbuilding.

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2013-07-09 19:02:23 +0000
+++ common-project-config.pri	2016-07-05 18:03:33 +0000
@@ -11,5 +11,11 @@
 TOP_SRC_DIR     = $$PWD
 TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$${BUILD_DIR}
 
+# appropriately select pkgconfig for cross compiling
+PKG_CONFIG_ARCH = $$section(QMAKE_CC, -, 0, -2)
+!isEmpty (PKG_CONFIG_ARCH) {
+    PKG_CONFIG = $$PKG_CONFIG_ARCH-pkg-config
+}
+
 include(coverage.pri)
 

=== modified file 'debian/control'
--- debian/control	2015-03-04 17:00:45 +0000
+++ debian/control	2016-07-05 18:03:33 +0000
@@ -12,7 +12,7 @@
                libunity-action-qt1-dev,
                libunity-dev,
                pkg-config,
-               python (>= 2.7),
+               python:any (>= 2.7),
                python-setuptools,
                qt5-default,
                qt5-qmake,

=== modified file 'debian/rules'
--- debian/rules	2014-07-14 23:28:57 +0000
+++ debian/rules	2016-07-05 18:03:33 +0000
@@ -4,6 +4,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export QT_SELECT=qt5-$(DEB_BUILD_MULTIARCH)-$(DEB_HOST_MULTIARCH)
+endif
+
 %:
 	dh $@ --with python2