diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:53 +0100 |
| commit | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (patch) | |
| tree | 3aadba9965f8a77e2ce4169233b524f091a0e176 /configure | |
| parent | bdf49888ef4044bd513bfd4c888071b41119a6d4 (diff) | |
| parent | b13801fd550d4eef2e45ac3e11304571e0146dd9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -455,7 +455,7 @@ DeviceVar() eq="=" ;; *) - echo >&2 "BUG: wrong command to QMakeVar: $1" + echo >&2 "BUG: wrong command to DeviceVar: $1" ;; esac @@ -7203,7 +7203,7 @@ if [ -n "$DISABLED_FEATURES" ]; then fi echo "QT_QCONFIG_PATH = ${CFG_QCONFIG_PATH#$relpath/src/corelib/global/}" -cat >>"$QTMODULE.tmp" <<EOF +cat <<EOF host_build { QT_CPU_FEATURES.$CFG_HOST_ARCH = $CFG_HOST_CPUFEATURES } else { |