1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

write [Paths] to qt.conf only if -external-hostbindir is used

Browse Source 
there is no point in overriding the built-in defaults with the same
values.

Change-Id: I24f66b86f751f7044625b5256f3d979ece782cf7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-12-21 18:13:23 +01:00
parent 6ffa3696e0
commit c8ae9bf58d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -4185,15 +4185,19 @@ QTCONFFILE="$outpath/bin/qt.conf"
cat > "$QTCONFFILE" <<EOF cat > "$QTCONFFILE" <<EOF
[EffectivePaths] [EffectivePaths]
Prefix=.. Prefix=..
EOF
if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
cat >> "$QTCONFFILE" <<EOF
[Paths] [Paths]
Prefix=$QT_EXT_PREFIX Prefix=$QT_EXT_PREFIX
TargetSpec=$XPLATFORM TargetSpec=$XPLATFORM
HostSpec=$PLATFORM HostSpec=$PLATFORM
EOF EOF
if [ -n "$CFG_SYSROOT" ]; then if [ -n "$CFG_SYSROOT" ]; then
cat >> "$QTCONFFILE" <<EOF cat >> "$QTCONFFILE" <<EOF
Sysroot=$CFG_SYSROOT Sysroot=$CFG_SYSROOT
EOF EOF
fi
fi fi
if [ x"$relpath" != x"$outpath" ]; then if [ x"$relpath" != x"$outpath" ]; then
cat >> "$QTCONFFILE" <<EOF cat >> "$QTCONFFILE" <<EOF