diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /configure | |
parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
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 |