From e5bd2ed18c41871488dbbc296d9a68ba2bf00735 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Tue, 22 May 2012 09:55:03 -0700 Subject: qmake can not process project file with UTF-8 BOM Project file contains UTF-8 BOM can't processesed by qmake and will cause subtle errors. Task-number: QTBUG-25848 Change-Id: Id69ed38c6be63a29fa3792a631cb8cb0ac176148 Reviewed-by: Oswald Buddenhagen --- qmake/project.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/project.cpp b/qmake/project.cpp index 9716237f90..3df80bc00d 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1239,8 +1239,14 @@ QMakeProject::read(const QString &file, QHash &place) parser.from_file = true; parser.file = filename; parser.line_no = 0; - QTextStream t(&qfile); - ret = read(t, place); + if (qfile.peek(3) == QByteArray("\xef\xbb\xbf")) { + //UTF-8 BOM will cause subtle errors + qmake_error_msg("Unexpected UTF-8 BOM found"); + ret = false; + } else { + QTextStream t(&qfile); + ret = read(t, place); + } if(!using_stdin) qfile.close(); } -- cgit v1.2.3