diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-07 17:38:13 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-15 22:44:05 +0000 |
| commit | 71fd04031860517c72de5487b6aa46793aad7d44 (patch) | |
| tree | cd3b5443311ebe6a3f8cbb4c2d2adb3383fbd61e /configure | |
| parent | 2b6bcd5ff31a51611f4701995a9c42a774eb4b8c (diff) | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -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 |