diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
commit | c4e472ea1037afde7b99d9132a49eb616cad240e (patch) | |
tree | c9e66fdda63a2e5c3f5a944d711e5c9845de33ac /configure | |
parent | 7b23ebefb2360feb139ff6e10d2253396e58721e (diff) | |
parent | 6c1e352803a6efbd8b14e5296434e22165b65084 (diff) |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
src/corelib/tools/qsimd_p.h
Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -115,13 +115,6 @@ shellEscape() echo "$@" | sed 's/ /\ /g' } -shellQuoteLines() -{ - # The call of the outer echo makes the shell word-split the output of - # the nested pipe, thus effectively converting newlines to spaces. - echo `echo "$1" | sed 's,^[^ ]* .*$,"&",'` -} - makeabs() { local FILE="$1" @@ -7154,8 +7147,6 @@ host_build { QT_TARGET_ARCH = $CFG_ARCH } else { QT_ARCH = $CFG_ARCH - QMAKE_DEFAULT_LIBDIRS = `shellQuoteLines "$DEFAULT_LIBDIRS"` - QMAKE_DEFAULT_INCDIRS = `shellQuoteLines "$DEFAULT_INCDIRS"` } QT_CONFIG += $QT_CONFIG |