From 6a90c9a8e547a377f17d67db7072c19a163db95c Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 15 Aug 2016 21:14:18 +0200
Subject: 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>
---
 mkspecs/features/qt_configure.prf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mkspecs/features')

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
-- 
cgit v1.2.3