diff options
Diffstat (limited to 'qmake/library/qmakeparser.cpp')
| -rw-r--r-- | qmake/library/qmakeparser.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index 6641149941..f32267cf59 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -239,7 +239,7 @@ bool QMakeParser::read(ProFile *pro) } QByteArray bcont = file.readAll(); - if (bcont.startsWith(QByteArray("\xef\xbb\xbf"))) { + if (bcont.startsWith("\xef\xbb\xbf")) { // UTF-8 BOM will cause subtle errors m_handler->message(QMakeParserHandler::ParserIoError, fL1S("Unexpected UTF-8 BOM in %1").arg(pro->fileName())); @@ -1147,11 +1147,10 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg uint nlen = uce[1]; if (uce[nlen + 2] == TokFuncTerminator) { m_tmp.setRawData((QChar *)uce + 2, nlen); - if (m_tmp == statics.strhost_build) { + if (m_tmp == statics.strhost_build) m_proFile->setHostBuild(true); - } else { + else parseError(fL1S("Unknown option() %1.").arg(m_tmp)); - } return; } } |