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

Handle windows line endings and tabs in json config files

Browse Source 
Change-Id: I154629d862977dde5232db3bb2597474b6053ffd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-08-15 21:14:18 +02:00 committed by Oswald Buddenhagen
parent 672c0b3721
commit 6a90c9a8e5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_configure.prf
View File

@ -826,6 +826,8 @@ defineTest(qtRunSingleTest) {
defineReplace(qtConfEvaluate) { defineReplace(qtConfEvaluate) {
isEmpty(1): return(true) isEmpty(1): return(true)
1 ~= s/$$escape_expand(\\t)/ /g
1 ~= s/$$escape_expand(\\r)//g
1 ~= s/$$escape_expand(\\n) */ /g 1 ~= s/$$escape_expand(\\n) */ /g
expr = $${1} expr = $${1}
expr ~= s/&&/ && /g expr ~= s/&&/ && /g