From 71fd04031860517c72de5487b6aa46793aad7d44 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 7 Nov 2016 17:38:13 +0100
Subject: [PATCH] qmake: fix /dev properties with -external-hostbindir

if the externally provided qmake had a different on-device install tree
layout, things would go wrong. of course, that's a rather unlikely case,
so nobody noticed ...

Change-Id: I59f9976a769ccb6099b7237ef42555f0549615aa
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 configure | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 789ba4cc74..3b0240f341 100755
--- a/configure
+++ b/configure
@@ -1803,15 +1803,9 @@ fi # Build qmake
 # create a qt.conf for the Qt build tree itself
 #-------------------------------------------------------------------------------
 
-QTCONFFILE="$outpath/bin/qt.conf"
-cat > "$QTCONFFILE" <<EOF
-[EffectivePaths]
-Prefix=..
-EOF
-if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
-    cat >> "$QTCONFFILE" <<EOF
-[Paths]
-Prefix=$QT_EXT_PREFIX
+printInstallPaths()
+{
+    cat <<EOF
 Documentation=$QT_REL_INSTALL_DOCS
 Headers=$QT_REL_INSTALL_HEADERS
 Libraries=$QT_REL_INSTALL_LIBS
@@ -1825,6 +1819,22 @@ Data=$QT_REL_INSTALL_DATA
 Translations=$QT_REL_INSTALL_TRANSLATIONS
 Examples=$QT_REL_INSTALL_EXAMPLES
 Tests=$QT_REL_INSTALL_TESTS
+EOF
+}
+
+QTCONFFILE="$outpath/bin/qt.conf"
+cat > "$QTCONFFILE" <<EOF
+[EffectivePaths]
+Prefix=..
+EOF
+if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
+    cat >> "$QTCONFFILE" <<EOF
+[DevicePaths]
+Prefix=$QT_INSTALL_PREFIX
+`printInstallPaths`
+[Paths]
+Prefix=$QT_EXT_PREFIX
+`printInstallPaths`
 HostPrefix=$QT_HOST_PREFIX
 HostBinaries=$QT_REL_HOST_BINS
 HostLibraries=$QT_REL_HOST_LIBS