From 226f013441990aa4a58f7c82e284057cff659959 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Aug 2013 13:47:13 +0200 Subject: [PATCH] use correct AND operator amends 066b08fc62 and e1f3732197 Change-Id: I248c1b3b85b9857552bfba34fdb5299024bb55eb Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- src/linguist/shared/qmakeparser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index e73d814..c61375b 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -153,7 +153,7 @@ QMakeParser::QMakeParser(ProFileCache *cache, QMakeParserHandler *handler) ProFile *QMakeParser::parsedProFile(const QString &fileName, ParseFlags flags) { ProFile *pro; - if ((flags && ParseUseCache) && m_cache) { + if ((flags & ParseUseCache) && m_cache) { ProFileCache::Entry *ent; #ifdef PROPARSER_THREAD_SAFE QMutexLocker locker(&m_cache->mutex); @@ -232,7 +232,7 @@ bool QMakeParser::read(ProFile *pro, ParseFlags flags) { QFile file(pro->fileName()); if (!file.open(QIODevice::ReadOnly)) { - if (m_handler && ((flags && ParseReportMissing) || IoUtils::exists(pro->fileName()))) + if (m_handler && ((flags & ParseReportMissing) || IoUtils::exists(pro->fileName()))) m_handler->message(QMakeParserHandler::ParserIoError, fL1S("Cannot read %1: %2").arg(pro->fileName(), file.errorString())); return false; -- 2.7.4