diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-15 21:14:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:35 +0000 |
| commit | 6a90c9a8e547a377f17d67db7072c19a163db95c (patch) | |
| tree | cf50701d9489aad801b575fe0534086a6f1a75ba /mkspecs/features | |
| parent | 672c0b3721201dcc5c41868b4c67976dc57d5e81 (diff) | |
Handle windows line endings and tabs in json config files
Change-Id: I154629d862977dde5232db3bb2597474b6053ffd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 0255a19fe9..c87c65289e 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -826,6 +826,8 @@ defineTest(qtRunSingleTest) { defineReplace(qtConfEvaluate) { isEmpty(1): return(true) + 1 ~= s/$$escape_expand(\\t)/ /g + 1 ~= s/$$escape_expand(\\r)//g 1 ~= s/$$escape_expand(\\n) */ /g expr = $${1} expr ~= s/&&/ && /g |